diff --git a/airtime_mvc/application/controllers/PlaylistController.php b/airtime_mvc/application/controllers/PlaylistController.php index 9e3ea0380..d1dcd1386 100644 --- a/airtime_mvc/application/controllers/PlaylistController.php +++ b/airtime_mvc/application/controllers/PlaylistController.php @@ -64,7 +64,7 @@ class PlaylistController extends Zend_Controller_Action unset($this->view->obj); } - private function createFullResponse($obj = null, $isJson = false) + private function createFullResponse($obj = null, $isJson = false, $formIsValid = false) { $isBlock = false; $viewPath = 'playlist/playlist.phtml'; @@ -80,11 +80,12 @@ class PlaylistController extends Zend_Controller_Action if ($isBlock) { $form = new Application_Form_SmartBlockCriteria(); $form->removeDecorator('DtDdWrapper'); - $form->startForm($obj->getId()); - + $form->startForm($obj->getId(), $formIsValid); + $this->view->form = $form; $this->view->obj = $obj; $this->view->id = $obj->getId(); + if ($isJson) { return $this->view->render($viewPath); } else { @@ -460,7 +461,7 @@ class PlaylistController extends Zend_Controller_Action $bl = new Application_Model_Block($params['obj_id']); if ($form->isValid($params)) { $bl->saveSmartBlockCriteria($params['data']); - $result['html'] = $this->createFullResponse($bl, true); + $result['html'] = $this->createFullResponse($bl, true, true); $result['result'] = 0; } else { $this->view->obj = $bl; @@ -486,7 +487,7 @@ class PlaylistController extends Zend_Controller_Action if ($form->isValid($params)) { $result = $bl->generateSmartBlock($params['data']); try { - die(json_encode(array("result"=>0, "html"=>$this->createFullResponse($bl, true)))); + die(json_encode(array("result"=>0, "html"=>$this->createFullResponse($bl, true, true)))); } catch (PlaylistNotFoundException $e) { $this->playlistNotFound('block'); } catch (Exception $e) { diff --git a/airtime_mvc/application/forms/SmartBlockCriteria.php b/airtime_mvc/application/forms/SmartBlockCriteria.php index 8d2e9683d..bbc751593 100644 --- a/airtime_mvc/application/forms/SmartBlockCriteria.php +++ b/airtime_mvc/application/forms/SmartBlockCriteria.php @@ -88,7 +88,7 @@ class Application_Form_SmartBlockCriteria extends Zend_Form_SubForm } - public function startForm($p_blockId) + public function startForm($p_blockId, $p_isValid = false) { // load type $out = CcBlockQuery::create()->findPk($p_blockId); @@ -236,7 +236,13 @@ class Application_Form_SmartBlockCriteria extends Zend_Form_SubForm //getting block content candidate count that meets criteria $bl = new Application_Model_Block($p_blockId); - $files = $bl->getListofFilesMeetCriteria(); + if ($p_isValid) { + $files = $bl->getListofFilesMeetCriteria(); + $showPoolCount = true; + } else { + $files = null; + $showPoolCount = false; + } $generate = new Zend_Form_Element_Button('generate_button'); $generate->setAttrib('class', 'ui-button ui-state-default sp-button'); @@ -256,7 +262,8 @@ class Application_Form_SmartBlockCriteria extends Zend_Form_SubForm $this->setDecorators(array( array('ViewScript', array('viewScript' => 'form/smart-block-criteria.phtml', "openOption"=> $openSmartBlockOption, - 'criteriasLength' => count($this->criteriaOptions), 'poolCount' => $files['count'], 'modRowMap' => $modRowMap)) + 'criteriasLength' => count($this->criteriaOptions), 'poolCount' => $files['count'], 'modRowMap' => $modRowMap, + 'showPoolCount' => $showPoolCount)) )); } diff --git a/airtime_mvc/application/views/scripts/form/smart-block-criteria.phtml b/airtime_mvc/application/views/scripts/form/smart-block-criteria.phtml index 8bd96a93e..445832e2f 100644 --- a/airtime_mvc/application/views/scripts/form/smart-block-criteria.phtml +++ b/airtime_mvc/application/views/scripts/form/smart-block-criteria.phtml @@ -66,32 +66,35 @@
-
- - poolCount > 1) { - echo $this->poolCount; - ?> - files meet the criteria - - - poolCount == 1) { - echo $this->poolCount; - ?> - file meets the criteria - - - - 0 files meet the criteria - - - -
+ + showPoolCount) { ?> +
+ + poolCount > 1) { + echo $this->poolCount; + ?> + files meet the criteria + + + poolCount == 1) { + echo $this->poolCount; + ?> + file meets the criteria + + + + 0 files meet the criteria + + + +
+