From ef0e800c92c1fb250af4ff808d7a8b2e00a8e0a5 Mon Sep 17 00:00:00 2001 From: James Date: Thu, 9 Aug 2012 14:12:30 -0400 Subject: [PATCH] CC-4186: Playlist Builder -> Smart Playlist : The static Smart Playlist's length value will be empty if no file meet the criteria. - fixed --- airtime_mvc/application/models/Block.php | 1 + airtime_mvc/application/views/scripts/playlist/playlist.phtml | 4 ++-- .../application/views/scripts/playlist/smart-block.phtml | 4 ++-- airtime_mvc/public/js/airtime/library/spl.js | 2 +- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/airtime_mvc/application/models/Block.php b/airtime_mvc/application/models/Block.php index 135d0ef41..5fa5e802a 100644 --- a/airtime_mvc/application/models/Block.php +++ b/airtime_mvc/application/models/Block.php @@ -883,6 +883,7 @@ EOT; public function deleteAllFilesFromBlock() { CcBlockcontentsQuery::create()->findByDbBlockId($this->id)->delete(); + $this->block->reload(); } // smart block functions start diff --git a/airtime_mvc/application/views/scripts/playlist/playlist.phtml b/airtime_mvc/application/views/scripts/playlist/playlist.phtml index 7d1a77021..795c44a6d 100644 --- a/airtime_mvc/application/views/scripts/playlist/playlist.phtml +++ b/airtime_mvc/application/views/scripts/playlist/playlist.phtml @@ -17,10 +17,10 @@ if (isset($this->obj)) {
-

+

obj->getName(); ?>

-

length; ?>

+

length; ?>

diff --git a/airtime_mvc/application/views/scripts/playlist/smart-block.phtml b/airtime_mvc/application/views/scripts/playlist/smart-block.phtml index 4351057e3..457615882 100644 --- a/airtime_mvc/application/views/scripts/playlist/smart-block.phtml +++ b/airtime_mvc/application/views/scripts/playlist/smart-block.phtml @@ -17,10 +17,10 @@ if (isset($this->obj)) {
-

+

obj->getName(); ?>

-

length; ?>

+

length; ?>

diff --git a/airtime_mvc/public/js/airtime/library/spl.js b/airtime_mvc/public/js/airtime/library/spl.js index f0a5354eb..c3ecab51e 100644 --- a/airtime_mvc/public/js/airtime/library/spl.js +++ b/airtime_mvc/public/js/airtime/library/spl.js @@ -296,7 +296,7 @@ var AIRTIME = (function(AIRTIME){ $('#spl_name > a') .empty() .append(json.name); - $('#spl_length') + $('#obj_length') .empty() .append(json.length); $('#fieldset-metadate_change textarea')