Merge branch 'master' of ssh://gitolite@asdynamics.com:50005/projects/fdn2.git

This commit is contained in:
Riccardo Di Dato
2016-01-14 12:44:37 +01:00
7 changed files with 39 additions and 4 deletions
+4
View File
@@ -15,6 +15,10 @@ require_once(dirname(__FILE__)."/Model.php");
require_once(dirname(__FILE__)."/models/ConfigModel.php");
require_once(dirname(__FILE__)."/models/TaskModel.php");
require_once(dirname(__FILE__)."/../media/HasMediaInterface.php");
require_once(dirname(__FILE__)."/../media/HasMediaModel.php");
require_once(dirname(__FILE__)."/models/NotiziaModel.php");
require_once(dirname(__FILE__)."/models/AdminModel.php");
require_once(dirname(__FILE__)."/models/UserModel.php");
+1 -1
View File
@@ -4,7 +4,7 @@ Author: Riccardo Di Dato
Creation Date: 07/gen/2016
*/
class NotiziaModel extends Model{
class NotiziaModel extends HasMediaModel{
public static function getCollectionName(){
return "notizia";
+1
View File
@@ -33,6 +33,7 @@ require_once(dirname(__FILE__)."/task/lib.inclusion.php");
require_once(dirname(__FILE__)."/media/lib.inclusion.php");
// asdasdasd
// require_once(dirname(__FILE__)."/Status.php");
+1 -1
View File
@@ -43,7 +43,7 @@ abstract class HasMediaModel extends Model implements HasMediaInterface{
* @see HasMediaInterface::getMediaReferences()
*/
public function getMediaReferences(){
if(!property_exists($this, "mediaReferences")){
if($this->hasProperty("mediaReferences")){
$this->mediaReferences = array();
}
return $this->mediaReferences;
+3 -1
View File
@@ -44,7 +44,7 @@ class MediaHandler{
GlobalVariables::get("dao")->save($model);
$media->setOwner($model);
$media->setOwnerReference($model);
GlobalVariables::get("dao")->save($media);
}
}catch(CoreException $ex){
@@ -61,10 +61,12 @@ class MediaHandler{
*/
public static function deleteMedia(HasMediaInterface $model, MediaInterface $media){
try{
$mediaArr = array();
$mediaArr = $model->getMediaReferences();
$mediaId = $media->getReference();
var_dump($mediaArr);
if(sizeof($mediaArr)>0){
$key = array_search($mediaId, $mediaArr);
if($key !== false){
+1
View File
@@ -48,6 +48,7 @@ class MediaModel extends Model implements MediaInterface{
}
public function renderMedia(){
var_dump($this->mediaRenderer);
$this->mediaRenderer->render();
}
+28 -1
View File
@@ -7,8 +7,35 @@ Creation Date: 22/dic/2015
require_once(dirname(__FILE__)."/load.php");
try {
$media = new MediaModel();
$prova = new stdClass();
$prova->mediaType = MediaModel::TYPE_YOUTUBE;
$prova->link = "www.pene.com";
$media = new MediaModel($prova);
// $media->renderMedia();
$news = new NotiziaModel();
GlobalVariables::get("dao")->save($news);
GlobalVariables::get("dao")->save($media);
MediaHandler::addMedia($news, $media);
var_dump($news);
echo "<br/><br/>";
var_dump($media);
echo "<br/><br/>";
MediaHandler::deleteMedia($news,$media);
echo "<br><br>";
var_dump($news);
echo "<br><br>";
var_dump($media);
// TestTask::setActive(false);
// echo "<br><br>";