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

CC-1805: Ability to edit a show 

Fixed bug for single-show instances.
This commit is contained in:
martin 2011-04-13 11:23:58 -04:00
parent b034958fc5
commit 9e23d8b902
3 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
VERSION
View File

@ -1 +1,2 @@
1.8.0 PRODUCT_ID=Airtime
PRODUCT_RELEASE=1.8.0

2
application/controllers/ScheduleController.php
View File

@ -246,7 +246,7 @@ class ScheduleController extends Zend_Controller_Action
if ($user->isAdmin()) { if ($user->isAdmin()) {
$menu[] = array('action' => array('type' => 'ajax', 'url' => '/Schedule/edit-show/format/json/id/'.$id, $menu[] = array('action' => array('type' => 'ajax', 'url' => '/Schedule/edit-show/format/json/id/'.$id,
'callback' => 'window["beginEditShow"]'), 'title' => 'Edit This Instance'); 'callback' => 'window["beginEditShow"]'), 'title' => 'Edit Show');
//$menu[] = array('action' => array('type' => 'ajax', 'url' => '/Schedule/cancel-show'.$params, //$menu[] = array('action' => array('type' => 'ajax', 'url' => '/Schedule/cancel-show'.$params,
// 'callback' => 'window["scheduleRefetchEvents"]'), 'title' => 'Edit This Instance and All Following'); // 'callback' => 'window["scheduleRefetchEvents"]'), 'title' => 'Edit This Instance and All Following');
$menu[] = array('action' => array('type' => 'ajax', 'url' => '/Schedule/delete-show'.$params, $menu[] = array('action' => array('type' => 'ajax', 'url' => '/Schedule/delete-show'.$params,

4
application/models/Shows.php
View File

@ -188,6 +188,10 @@ class Show {
."AND record = 1"; ."AND record = 1";
$baseDate = $CC_DBC->GetOne($sql); $baseDate = $CC_DBC->GetOne($sql);
if (is_null($baseDate)){
return array();
}
$sql = "SELECT date(DATE '$baseDate' + day_offset::INTERVAL) as start_date, start_time FROM cc_show_rebroadcast " $sql = "SELECT date(DATE '$baseDate' + day_offset::INTERVAL) as start_date, start_time FROM cc_show_rebroadcast "
."WHERE show_id = $showId " ."WHERE show_id = $showId "
."ORDER BY start_date"; ."ORDER BY start_date";