From a1a7396ec9ad3c28d3ae7221cb26157aff059c94 Mon Sep 17 00:00:00 2001 From: denise Date: Tue, 6 Nov 2012 14:29:26 -0500 Subject: [PATCH 1/5] CC-4455: "Add to current smart block" context menu action should be disabled for dynamic smart blocks -disabled this button in the library toolbar if dynamic blocks are open --- .../library/events/library_playlistbuilder.js | 12 +++++++++--- .../public/js/airtime/playlist/smart_blockbuilder.js | 3 ++- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/airtime_mvc/public/js/airtime/library/events/library_playlistbuilder.js b/airtime_mvc/public/js/airtime/library/events/library_playlistbuilder.js index fd9851f33..937342217 100644 --- a/airtime_mvc/public/js/airtime/library/events/library_playlistbuilder.js +++ b/airtime_mvc/public/js/airtime/library/events/library_playlistbuilder.js @@ -8,10 +8,16 @@ var AIRTIME = (function(AIRTIME) { mod = AIRTIME.library; mod.checkAddButton = function() { - var selected = mod.getChosenItemsLength(), sortable = $('#spl_sortable'), check = false; - // make sure audioclips are selected and a playlist is currently open. - if (selected !== 0 && sortable.length !== 0) { + var selected = mod.getChosenItemsLength(), + sortable = $('#spl_sortable:visible'), + check = false, + blockType = $('input[name=sp_type]:checked', '#smart-block-form').val(); + + // make sure audioclips are selected and a playlist or static block is currently open. + // static blocks have value of 0 + // dynamic blocks have value of 1 + if (selected !== 0 && (sortable.length !== 0 || blockType === "0")) { check = true; } diff --git a/airtime_mvc/public/js/airtime/playlist/smart_blockbuilder.js b/airtime_mvc/public/js/airtime/playlist/smart_blockbuilder.js index c33ccc351..94f40b4a8 100644 --- a/airtime_mvc/public/js/airtime/playlist/smart_blockbuilder.js +++ b/airtime_mvc/public/js/airtime/playlist/smart_blockbuilder.js @@ -201,7 +201,8 @@ function setSmartBlockEvents() { /********** CHANGE PLAYLIST TYPE **********/ form.find('dd[id="sp_type-element"]').live("change", function(){ - setupUI(); + setupUI(); + AIRTIME.library.checkAddButton(); }); /********** CRITERIA CHANGE **********/ From c605c9726863b7a08fbb019606c490ae726de434 Mon Sep 17 00:00:00 2001 From: denise Date: Tue, 6 Nov 2012 14:33:34 -0500 Subject: [PATCH 2/5] CC-4455: "Add to current smart block" context menu action should be disabled for dynamic smart blocks -disabled this option from context menu --- airtime_mvc/application/controllers/LibraryController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/airtime_mvc/application/controllers/LibraryController.php b/airtime_mvc/application/controllers/LibraryController.php index 5bd5949de..a1a4edd82 100644 --- a/airtime_mvc/application/controllers/LibraryController.php +++ b/airtime_mvc/application/controllers/LibraryController.php @@ -176,7 +176,7 @@ class LibraryController extends Zend_Controller_Action if ($isAdminOrPM || $obj->getCreatorId() == $user->getId()) { if ($obj_sess->type === "playlist") { $menu["pl_add"] = array("name"=> "Add to Playlist", "icon" => "add-playlist", "icon" => "copy"); - } elseif ($obj_sess->type === "block") { + } elseif ($obj_sess->type === "block" && $obj->isStatic()) { $menu["pl_add"] = array("name"=> "Add to Smart Block", "icon" => "add-playlist", "icon" => "copy"); } } From 504d9968f14a3f796636c25aced49608796e0ca4 Mon Sep 17 00:00:00 2001 From: James Date: Tue, 6 Nov 2012 16:32:00 -0500 Subject: [PATCH 3/5] CC-4639: Give an option to allow smart blocks to reuse tracks if not enough tracks meet the time limit - fixed the bug where airtime hangs when repeat is checked but 0 files that meet criteria - fixed dynamic block bug where it didn't generate correct list --- airtime_mvc/application/controllers/PlaylistController.php | 2 +- airtime_mvc/application/models/Block.php | 2 +- airtime_mvc/application/models/Scheduler.php | 7 ++++--- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/airtime_mvc/application/controllers/PlaylistController.php b/airtime_mvc/application/controllers/PlaylistController.php index 38dbd4fd2..0d2ead443 100644 --- a/airtime_mvc/application/controllers/PlaylistController.php +++ b/airtime_mvc/application/controllers/PlaylistController.php @@ -513,7 +513,7 @@ class PlaylistController extends Zend_Controller_Action } catch (BlockNotFoundException $e) { $this->playlistNotFound('block', true); } catch (Exception $e) { - //Logging::info($e); + Logging::info($e); $this->playlistUnknownError($e); } } diff --git a/airtime_mvc/application/models/Block.php b/airtime_mvc/application/models/Block.php index 3aa0a1882..c06b24cb8 100644 --- a/airtime_mvc/application/models/Block.php +++ b/airtime_mvc/application/models/Block.php @@ -1191,7 +1191,7 @@ SQL; $sizeOfInsert = count($insertList); // if block is not full and reapeat_track is check, fill up more - while (!$isBlockFull && $repeat == 1) { + while (!$isBlockFull && $repeat == 1 && $sizeOfInsert > 0) { $randomEleKey = array_rand(array_slice($insertList, 0, $sizeOfInsert)); $insertList[] = $insertList[$randomEleKey]; $totalTime += $insertList[$randomEleKey]['length']; diff --git a/airtime_mvc/application/models/Scheduler.php b/airtime_mvc/application/models/Scheduler.php index 356210b74..80f7ded9e 100644 --- a/airtime_mvc/application/models/Scheduler.php +++ b/airtime_mvc/application/models/Scheduler.php @@ -193,7 +193,8 @@ class Application_Model_Scheduler } } else { $dynamicFiles = $bl->getListOfFilesUnderLimit(); - foreach ($dynamicFiles as $fileId=>$f) { + foreach ($dynamicFiles as $f) { + $fileId = $f['id']; $file = CcFilesQuery::create()->findPk($fileId); if (isset($file) && $file->getDbFileExists()) { $data["id"] = $file->getDbId(); @@ -250,7 +251,8 @@ class Application_Model_Scheduler } } else { $dynamicFiles = $bl->getListOfFilesUnderLimit(); - foreach ($dynamicFiles as $fileId=>$f) { + foreach ($dynamicFiles as $f) { + $fileId = $f['id']; $file = CcFilesQuery::create()->findPk($fileId); if (isset($file) && $file->getDbFileExists()) { $data["id"] = $file->getDbId(); @@ -445,7 +447,6 @@ class Application_Model_Scheduler } else { $sched = new CcSchedule(); } - Logging::info($file); $sched->setDbStarts($nextStartDT) ->setDbEnds($endTimeDT) ->setDbCueIn($file['cuein']) From bf4f5fd699451f6d5b35d19d709e69832ada462d Mon Sep 17 00:00:00 2001 From: denise Date: Tue, 6 Nov 2012 16:34:06 -0500 Subject: [PATCH 4/5] CC-4607: Library: Please make the 'Add x items' following mouse's point -fixed --- .../js/airtime/library/events/library_playlistbuilder.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/airtime_mvc/public/js/airtime/library/events/library_playlistbuilder.js b/airtime_mvc/public/js/airtime/library/events/library_playlistbuilder.js index 937342217..457b219b7 100644 --- a/airtime_mvc/public/js/airtime/library/events/library_playlistbuilder.js +++ b/airtime_mvc/public/js/airtime/library/events/library_playlistbuilder.js @@ -102,6 +102,10 @@ var AIRTIME = (function(AIRTIME) { return container; }, cursor : 'pointer', + cursorAt: { + top: 30, + left: 100 + }, connectToSortable : '#spl_sortable' }); }; From 29c7e58643fb5f8fd294c8b38ec9972091c3fab9 Mon Sep 17 00:00:00 2001 From: denise Date: Tue, 6 Nov 2012 16:49:36 -0500 Subject: [PATCH 5/5] CC-4679: Library: Deleting Webstream leaves the SAVE button -fixed --- .../application/views/scripts/webstream/webstream.phtml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/airtime_mvc/application/views/scripts/webstream/webstream.phtml b/airtime_mvc/application/views/scripts/webstream/webstream.phtml index 6695c82fc..eb9574ffe 100644 --- a/airtime_mvc/application/views/scripts/webstream/webstream.phtml +++ b/airtime_mvc/application/views/scripts/webstream/webstream.phtml @@ -9,11 +9,11 @@
  • New Webstream
    • - + +obj)) : ?>
    -obj)) : ?>