From 33fe2f3467b6cd1d1caeaa4d461fbd208c7197b3 Mon Sep 17 00:00:00 2001 From: denise Date: Thu, 6 Sep 2012 14:10:50 -0400 Subject: [PATCH 1/6] CC-4351: Library->Deletion of Smart Block and saving it leads to "Processing" message being displayed for a while -fixed --- airtime_mvc/application/controllers/PlaylistController.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/airtime_mvc/application/controllers/PlaylistController.php b/airtime_mvc/application/controllers/PlaylistController.php index 6d9a9d8c3..42c6a2442 100644 --- a/airtime_mvc/application/controllers/PlaylistController.php +++ b/airtime_mvc/application/controllers/PlaylistController.php @@ -460,9 +460,13 @@ class PlaylistController extends Zend_Controller_Action $result = array(); if ($params['type'] == 'block') { + try { + $bl = new Application_Model_Block($params['obj_id']); + } catch (BlockNotFoundException $e) { + $this->playlistNotFound('block', true); + } $form = new Application_Form_SmartBlockCriteria(); $form->startForm($params['obj_id']); - $bl = new Application_Model_Block($params['obj_id']); if ($form->isValid($params)) { $this->setPlaylistNameDescAction(); $bl->saveSmartBlockCriteria($params['data']); From 45729f16e77112db9f1030dfa974318c4945ec62 Mon Sep 17 00:00:00 2001 From: Rudi Grinberg Date: Thu, 6 Sep 2012 14:14:05 -0400 Subject: [PATCH 2/6] cc-4347: PDOOOOOOOOOOOOOOOO --- airtime_mvc/application/models/Show.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/airtime_mvc/application/models/Show.php b/airtime_mvc/application/models/Show.php index dd3a1e520..610ce3647 100644 --- a/airtime_mvc/application/models/Show.php +++ b/airtime_mvc/application/models/Show.php @@ -127,14 +127,14 @@ class Application_Model_Show $sql = "SELECT first_name, last_name FROM cc_show_hosts LEFT JOIN cc_subjs ON cc_show_hosts.subjs_id = cc_subjs.id - WHERE show_id = {$this->_showId}"; + WHERE show_id = :show_id"; - $hosts = $con->query($sql)->fetchAll(); + $hosts = Application_Common_Database::prepareAndExecute( $sql, + array( ':show_id' => $this->_showId ), 'all'); - $res = array(); - foreach ($hosts as $host) { - $res[] = $host['first_name']." ".$host['last_name']; - } + $res = array_map( function($host) { + return $host['first_name']." ".$host['last_name']; + }, $hosts); return $res; } From cd9e89560d8d4845fa010b081ebd9a67ef732c22 Mon Sep 17 00:00:00 2001 From: Rudi Grinberg Date: Thu, 6 Sep 2012 14:16:10 -0400 Subject: [PATCH 3/6] cc-4347: small correction. --- airtime_mvc/application/models/Show.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/airtime_mvc/application/models/Show.php b/airtime_mvc/application/models/Show.php index 610ce3647..5804f2226 100644 --- a/airtime_mvc/application/models/Show.php +++ b/airtime_mvc/application/models/Show.php @@ -130,7 +130,7 @@ class Application_Model_Show WHERE show_id = :show_id"; $hosts = Application_Common_Database::prepareAndExecute( $sql, - array( ':show_id' => $this->_showId ), 'all'); + array( ':show_id' => $this->getId() ), 'all'); $res = array_map( function($host) { return $host['first_name']." ".$host['last_name']; From 264e909d5a16c2e8f1102ef26c1fe39e5300673c Mon Sep 17 00:00:00 2001 From: Rudi Grinberg Date: Thu, 6 Sep 2012 14:17:24 -0400 Subject: [PATCH 4/6] cc-4347: PDOOOOOOOOOOOOOOOO --- airtime_mvc/application/models/Show.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/airtime_mvc/application/models/Show.php b/airtime_mvc/application/models/Show.php index 5804f2226..9cce760d8 100644 --- a/airtime_mvc/application/models/Show.php +++ b/airtime_mvc/application/models/Show.php @@ -145,9 +145,10 @@ class Application_Model_Show $sql = "SELECT subjs_id FROM cc_show_hosts - WHERE show_id = {$this->_showId}"; + WHERE show_id = :show_id"; - $hosts = $con->query($sql)->fetchAll(); + $hosts = Application_Common_Database::prepareAndExecute( + $sql, array( ':show_id' => $this->getId() ), 'all'); return $hosts; } From 8125d6b553a71ec17ac514d644781e1e9defb293 Mon Sep 17 00:00:00 2001 From: denise Date: Thu, 6 Sep 2012 14:30:09 -0400 Subject: [PATCH 5/6] CC-4344: Conductor column not available in library view -done --- airtime_mvc/application/models/StoredFile.php | 2 +- airtime_mvc/public/js/airtime/library/library.js | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/airtime_mvc/application/models/StoredFile.php b/airtime_mvc/application/models/StoredFile.php index 39e5fd0af..9e6463ed9 100644 --- a/airtime_mvc/application/models/StoredFile.php +++ b/airtime_mvc/application/models/StoredFile.php @@ -650,7 +650,7 @@ class Application_Model_StoredFile $displayColumns = array("id", "track_title", "artist_name", "album_title", "genre", "length", "year", "utime", "mtime", "ftype", "track_number", "mood", "bpm", "composer", "info_url", "bit_rate", "sample_rate", "isrc_number", "encoded_by", "label", "copyright", "mime", - "language", "filepath","owner" + "language", "filepath","owner","conductor" ); //Logging::info($datatables); diff --git a/airtime_mvc/public/js/airtime/library/library.js b/airtime_mvc/public/js/airtime/library/library.js index c37522d87..7d828d13a 100644 --- a/airtime_mvc/public/js/airtime/library/library.js +++ b/airtime_mvc/public/js/airtime/library/library.js @@ -412,7 +412,8 @@ var AIRTIME = (function(AIRTIME) { /* Copyright */ { "sTitle" : "Copyright" , "mDataProp" : "copyright" , "bVisible" : false , "sClass" : "library_copyright" , "sWidth" : "125px" } , /* Mime */ { "sTitle" : "Mime" , "mDataProp" : "mime" , "bVisible" : false , "sClass" : "library_mime" , "sWidth" : "80px" } , /* Language */ { "sTitle" : "Language" , "mDataProp" : "language" , "bVisible" : false , "sClass" : "library_language" , "sWidth" : "125px" } , - /* Owner */ { "sTitle" : "Owner" , "mDataProp" : "owner" , "bVisible" : false , "sClass" : "library_language" , "sWidth" : "125px" } + /* Owner */ { "sTitle" : "Owner" , "mDataProp" : "owner" , "bVisible" : false , "sClass" : "library_language" , "sWidth" : "125px" } , + /* Conductor */ { "sTitle" : "Conductor" , "mDataProp" : "conductor" , "bVisible" : false , "sClass" : "library_conductor" , "sWidth" : "125px" } ], "bProcessing": true, From 3f1d979c67c095ebd98077c480204e1be2af0e0b Mon Sep 17 00:00:00 2001 From: Rudi Grinberg Date: Thu, 6 Sep 2012 14:41:40 -0400 Subject: [PATCH 6/6] cc-4347: PDO PDO PDO!! --- airtime_mvc/application/models/Show.php | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/airtime_mvc/application/models/Show.php b/airtime_mvc/application/models/Show.php index 9cce760d8..821179e21 100644 --- a/airtime_mvc/application/models/Show.php +++ b/airtime_mvc/application/models/Show.php @@ -1320,8 +1320,9 @@ class Application_Model_Show $showInstance->correctScheduleStartTimes(); } - $sql = "SELECT * FROM cc_show_rebroadcast WHERE show_id={$show_id}"; - $rebroadcasts = $con->query($sql)->fetchAll(); + $sql = "SELECT * FROM cc_show_rebroadcast WHERE show_id=:show_id"; + $rebroadcasts = Application_Common_Database::prepareAndExecute($sql, + array( ':show_id' => $show_id ), 'all'); if ($showInstance->isRecorded()) { $showInstance->deleteRebroadcasts(); @@ -1368,8 +1369,10 @@ class Application_Model_Show //convert $last_show into a UTC DateTime object, or null if there is no last show. $utcLastShowDateTime = $last_show ? Application_Common_DateHelper::ConvertToUtcDateTime($last_show, $timezone) : null; - $sql = "SELECT * FROM cc_show_rebroadcast WHERE show_id={$show_id}"; - $rebroadcasts = $con->query($sql)->fetchAll(); + $sql = "SELECT * FROM cc_show_rebroadcast WHERE show_id=:show_id"; + + $rebroadcasts = Application_Common_Database::prepareAndExecute( $sql, + array( ':show_id' => $show_id ), 'all'); $show = new Application_Model_Show($show_id);