From 025ef0ed27e50fd942bffe90b0bfd2408f2c6164 Mon Sep 17 00:00:00 2001 From: Martin Konecny Date: Tue, 15 May 2012 12:35:02 -0400 Subject: [PATCH 1/3] CC-3826: Couldn't find constant MDATA_KEY_RECORD_DATE -fixed --- airtime_mvc/application/configs/constants.php | 1 + airtime_mvc/application/controllers/ApiController.php | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/airtime_mvc/application/configs/constants.php b/airtime_mvc/application/configs/constants.php index 1a39ddb43..db3660342 100644 --- a/airtime_mvc/application/configs/constants.php +++ b/airtime_mvc/application/configs/constants.php @@ -26,6 +26,7 @@ define('MDATA_KEY_ENCODER', 'encoded_by'); define('MDATA_KEY_ISRC', 'isrc_number'); define('MDATA_KEY_COPYRIGHT', 'copyright'); define('MDATA_KEY_YEAR', 'year'); +define('MDATA_KEY_RECORD_DATE', 'year'); define('MDATA_KEY_BPM', 'bpm'); define('MDATA_KEY_TRACKNUMBER', 'track_number'); define('MDATA_KEY_CONDUCTOR', 'conductor'); diff --git a/airtime_mvc/application/controllers/ApiController.php b/airtime_mvc/application/controllers/ApiController.php index a9dda358b..f7fd4ce8e 100644 --- a/airtime_mvc/application/controllers/ApiController.php +++ b/airtime_mvc/application/controllers/ApiController.php @@ -603,7 +603,6 @@ class ApiController extends Zend_Controller_Action $filepath = $md['MDATA_KEY_FILEPATH']; $filepath = str_replace("\\", "", $filepath); $file->setFilePath($filepath); - //$file->setMetadata($md); } } else if ($mode == "delete") { From 4b03a45d4660e7eb5cfdffabada6fd92429f27dd Mon Sep 17 00:00:00 2001 From: Martin Konecny Date: Tue, 15 May 2012 14:20:53 -0400 Subject: [PATCH 2/3] CC-3757: Widgets: ON AIR show's elapsed and remaining time are wrong -fixed --- airtime_mvc/application/models/Show.php | 3 +-- widgets/js/jquery.showinfo.js | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/airtime_mvc/application/models/Show.php b/airtime_mvc/application/models/Show.php index 6794fe756..33d84b33e 100644 --- a/airtime_mvc/application/models/Show.php +++ b/airtime_mvc/application/models/Show.php @@ -1753,8 +1753,7 @@ class Application_Model_Show { ." AND modified_instance != TRUE" ." ORDER BY si.starts"; - // Convert back to local timezone - $rows = $con->query($sql)->fetchAll(); + $rows = $con->query($sql)->fetchAll(PDO::FETCH_ASSOC); $numberOfRows = count($rows); $results['previousShow'] = array(); diff --git a/widgets/js/jquery.showinfo.js b/widgets/js/jquery.showinfo.js index 8017081d7..873f5b64f 100644 --- a/widgets/js/jquery.showinfo.js +++ b/widgets/js/jquery.showinfo.js @@ -282,7 +282,7 @@ function ScheduleData(data){ this.schedulePosixTime = convertDateToPosixTime(data.schedulerTime); - this.schedulePosixTime += parseInt(data.timezoneOffset)*1000; + //this.schedulePosixTime += parseInt(data.timezoneOffset, 10)*1000; var date = new Date(); this.localRemoteTimeOffset = date.getTime() - this.schedulePosixTime; } From 6695e3e190f9e05f404260535d8bea0904e5472f Mon Sep 17 00:00:00 2001 From: Martin Konecny Date: Tue, 15 May 2012 14:35:01 -0400 Subject: [PATCH 3/3] -fix javascript error in widgets --- airtime_mvc/application/models/Show.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/airtime_mvc/application/models/Show.php b/airtime_mvc/application/models/Show.php index 33d84b33e..62a94cff8 100644 --- a/airtime_mvc/application/models/Show.php +++ b/airtime_mvc/application/models/Show.php @@ -1770,6 +1770,7 @@ class Application_Model_Show { "id"=>$rows[$i-1]['id'], "instance_id"=>$rows[$i-1]['instance_id'], "name"=>$rows[$i-1]['name'], + "url"=>$rows[$i-1]['url'], "start_timestamp"=>$rows[$i-1]['start_timestamp'], "end_timestamp"=>$rows[$i-1]['end_timestamp'], "starts"=>$rows[$i-1]['starts'], @@ -1783,6 +1784,7 @@ class Application_Model_Show { "id"=>$rows[$i+1]['id'], "instance_id"=>$rows[$i+1]['instance_id'], "name"=>$rows[$i+1]['name'], + "url"=>$rows[$i+1]['url'], "start_timestamp"=>$rows[$i+1]['start_timestamp'], "end_timestamp"=>$rows[$i+1]['end_timestamp'], "starts"=>$rows[$i+1]['starts'], @@ -1801,6 +1803,7 @@ class Application_Model_Show { "id"=>$rows[$i]['id'], "instance_id"=>$rows[$i]['instance_id'], "name"=>$rows[$i]['name'], + "url"=>$rows[$i]['url'], "start_timestamp"=>$rows[$i]['start_timestamp'], "end_timestamp"=>$rows[$i]['end_timestamp'], "starts"=>$rows[$i]['starts'],