Congegni
/
sintonia
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'devel' of dev.sourcefabric.org:airtime into devel

This commit is contained in:
Martin Konecny 2012-09-14 14:53:32 -04:00
parent 78460703a2 79ce7b572c
commit 198d15adc8
3 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
airtime_mvc/application/controllers/LibraryController.php
View File

@ -59,6 +59,7 @@ class LibraryController extends Zend_Controller_Action
$objInfo = Application_Model_Library::getObjInfo($obj_sess->type); $objInfo = Application_Model_Library::getObjInfo($obj_sess->type);
Logging::info($obj_sess->id); Logging::info($obj_sess->id);
Logging::info($obj_sess->type); Logging::info($obj_sess->type);
$objInfo = Application_Model_Library::getObjInfo($obj_sess->type); $objInfo = Application_Model_Library::getObjInfo($obj_sess->type);
$obj = new $objInfo['className']($obj_sess->id); $obj = new $objInfo['className']($obj_sess->id);
$userInfo = Zend_Auth::getInstance()->getStorage()->read(); $userInfo = Zend_Auth::getInstance()->getStorage()->read();

3
airtime_mvc/application/controllers/UserController.php
View File

@ -108,7 +108,8 @@ class UserController extends Zend_Controller_Action
# TODO : remove this. we only use default for now not to break the UI. # TODO : remove this. we only use default for now not to break the UI.
if (!$files_action) { # set default action if (!$files_action) { # set default action
$files_action = "delete_cascade"; $files_action = "reassign_to";
$valid_actions =
} }
# only delete when valid action is selected for the owned files # only delete when valid action is selected for the owned files

5
airtime_mvc/application/models/Webstream.php
View File

@ -32,6 +32,11 @@ class Application_Model_Webstream implements Application_Model_LibraryEditable
return $this->webstream->getDbId(); return $this->webstream->getDbId();
} }
public function getCreatorId()
{
return $this->Webstream->getCcSubjs()->getDbId();
}
public function getLastModified($p_type) public function getLastModified($p_type)
{ {
return "modified"; return "modified";