From 10ea825536adf3c7ad082eacd651ff83979ca5c6 Mon Sep 17 00:00:00 2001
From: denise <denise@denise-DX4860.(none)>
Date: Thu, 9 Aug 2012 18:24:22 -0400
Subject: [PATCH] CC-4201: Playlist Builder -> Smart Playlist: DJ user can edit
 SP created by others in particular situation

-fixed
---
 airtime_mvc/application/controllers/PlaylistController.php  | 2 +-
 .../application/views/scripts/playlist/playlist.phtml       | 3 +--
 .../application/views/scripts/playlist/smart-block.phtml    | 6 +++++-
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/airtime_mvc/application/controllers/PlaylistController.php b/airtime_mvc/application/controllers/PlaylistController.php
index 8738a4d21..07f1eee21 100644
--- a/airtime_mvc/application/controllers/PlaylistController.php
+++ b/airtime_mvc/application/controllers/PlaylistController.php
@@ -195,9 +195,9 @@ class PlaylistController extends Zend_Controller_Action
                 $userInfo = Zend_Auth::getInstance()->getStorage()->read();
                 $user = new Application_Model_User($userInfo->id);
                 $isAdminOrPM = $user->isUserType(array(UTYPE_ADMIN, UTYPE_PROGRAM_MANAGER));
-                $this->view->obj = $obj;
                 
                 if($isAdminOrPM || $obj->getCreatorId() == $userInfo->id){
+                    $this->view->obj = $obj;
                     if($this->obj_sess->type == "block"){
                         $form = new Application_Form_SmartBlockCriteria();
                         $form->startForm($this->obj_sess->id);
diff --git a/airtime_mvc/application/views/scripts/playlist/playlist.phtml b/airtime_mvc/application/views/scripts/playlist/playlist.phtml
index 35593e06e..8b18580b2 100644
--- a/airtime_mvc/application/views/scripts/playlist/playlist.phtml
+++ b/airtime_mvc/application/views/scripts/playlist/playlist.phtml
@@ -12,9 +12,8 @@ if (isset($this->obj)) {
     </a>
 <?php endif; ?>
 
-<button class="ui-button ui-state-default sp-button" type="button" id="save_button">Save</button>
-
 <?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_lastMod" type="hidden" value="<?php echo $this->obj->getLastModified('U'); ?>"></input>
     <input id='obj_type' type='hidden' value='playlist'></input>
diff --git a/airtime_mvc/application/views/scripts/playlist/smart-block.phtml b/airtime_mvc/application/views/scripts/playlist/smart-block.phtml
index d720ae7a0..a7a26b661 100644
--- a/airtime_mvc/application/views/scripts/playlist/smart-block.phtml
+++ b/airtime_mvc/application/views/scripts/playlist/smart-block.phtml
@@ -12,7 +12,11 @@ if (isset($this->obj)) {
     </a>
 <?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)) : ?>
     <input id="obj_id" type="hidden" value="<?php echo $this->obj->getId(); ?>"></input>