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-08-09 18:27:53 -04:00
parent 037e78730b 5a63a284c8
commit 8eea34dc39
3 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
airtime_mvc/application/controllers/PlaylistController.php
View File

@ -195,9 +195,9 @@ class PlaylistController extends Zend_Controller_Action
$userInfo = Zend_Auth::getInstance()->getStorage()->read(); $userInfo = Zend_Auth::getInstance()->getStorage()->read();
$user = new Application_Model_User($userInfo->id); $user = new Application_Model_User($userInfo->id);
$isAdminOrPM = $user->isUserType(array(UTYPE_ADMIN, UTYPE_PROGRAM_MANAGER)); $isAdminOrPM = $user->isUserType(array(UTYPE_ADMIN, UTYPE_PROGRAM_MANAGER));
$this->view->obj = $obj;
if($isAdminOrPM || $obj->getCreatorId() == $userInfo->id){ if($isAdminOrPM || $obj->getCreatorId() == $userInfo->id){
$this->view->obj = $obj;
if($this->obj_sess->type == "block"){ if($this->obj_sess->type == "block"){
$form = new Application_Form_SmartBlockCriteria(); $form = new Application_Form_SmartBlockCriteria();
$form->startForm($this->obj_sess->id); $form->startForm($this->obj_sess->id);

3
airtime_mvc/application/views/scripts/playlist/playlist.phtml
View File

@ -12,9 +12,8 @@ if (isset($this->obj)) {
</a> </a>
<?php endif; ?> <?php endif; ?>
<button class="ui-button ui-state-default sp-button" type="button" id="save_button">Save</button>
<?php if (isset($this->obj)) : ?> <?php if (isset($this->obj)) : ?>
<button class="ui-button ui-state-default sp-button" type="button" id="save_button">Save</button>
<input id="obj_id" type="hidden" value="<?php echo $this->obj->getId(); ?>"></input> <input id="obj_id" type="hidden" value="<?php echo $this->obj->getId(); ?>"></input>
<input id="obj_lastMod" type="hidden" value="<?php echo $this->obj->getLastModified('U'); ?>"></input> <input id="obj_lastMod" type="hidden" value="<?php echo $this->obj->getLastModified('U'); ?>"></input>
<input id='obj_type' type='hidden' value='playlist'></input> <input id='obj_type' type='hidden' value='playlist'></input>

6
airtime_mvc/application/views/scripts/playlist/smart-block.phtml
View File

@ -12,7 +12,11 @@ if (isset($this->obj)) {
</a> </a>
<?php endif; ?> <?php endif; ?>
<?php echo $this->form->getElement('save_button');?> <?php
if (isset($this->form)) {
echo $this->form->getElement('save_button');
}
?>
<?php if (isset($this->obj)) : ?> <?php if (isset($this->obj)) : ?>
<input id="obj_id" type="hidden" value="<?php echo $this->obj->getId(); ?>"></input> <input id="obj_id" type="hidden" value="<?php echo $this->obj->getId(); ?>"></input>