From 91906e5b5d236f022539971ca04b0426abcf9b18 Mon Sep 17 00:00:00 2001 From: Robb Ebright Date: Sun, 26 Nov 2017 14:48:41 -0500 Subject: [PATCH 1/6] Moved files that meet criteria to top of track listing --- .../controllers/PlaylistController.php | 16 +++++----- .../scripts/form/smart-block-criteria.phtml | 4 ++- .../views/scripts/playlist/update.phtml | 30 +++++++++++++++++++ 3 files changed, 41 insertions(+), 9 deletions(-) diff --git a/airtime_mvc/application/controllers/PlaylistController.php b/airtime_mvc/application/controllers/PlaylistController.php index 84848d301..0fde85f88 100644 --- a/airtime_mvc/application/controllers/PlaylistController.php +++ b/airtime_mvc/application/controllers/PlaylistController.php @@ -57,18 +57,20 @@ class PlaylistController extends Zend_Controller_Action return $obj; } - private function createUpdateResponse($obj) + private function createUpdateResponse($obj, $formIsValid = false) { $formatter = new LengthFormatter($obj->getLength()); $this->view->length = $formatter->format(); $this->view->obj = $obj; $this->view->contents = $obj->getContents(); + if ($formIsValid) { + $this->view->poolCount = $obj->getListofFilesMeetCriteria()['count']; + } $this->view->html = $this->view->render('playlist/update.phtml'); $this->view->name = $obj->getName(); $this->view->description = $obj->getDescription(); $this->view->modified = $obj->getLastModified("U"); - unset($this->view->obj); } @@ -99,7 +101,6 @@ class PlaylistController extends Zend_Controller_Action $form = new Application_Form_SmartBlockCriteria(); $form->removeDecorator('DtDdWrapper'); $form->startForm($obj->getId(), $formIsValid); - $this->view->form = $form; $this->view->obj = $obj; //$this->view->type = "sb"; @@ -555,8 +556,7 @@ class PlaylistController extends Zend_Controller_Action if ($form->isValid($params)) { $this->setPlaylistNameDescAction(); $bl->saveSmartBlockCriteria($params['data']); - - $this->createUpdateResponse($bl); + $this->createUpdateResponse($bl, true); $this->view->result = 0; /* $result['html'] = $this->createFullResponse($bl, true, true); @@ -599,7 +599,7 @@ class PlaylistController extends Zend_Controller_Action if ($form->isValid($params)) { $result = $bl->generateSmartBlock($params['data']); $this->view->result = $result['result']; - $this->createUpdateResponse($bl); + $this->createUpdateResponse($bl, true); #$this->_helper->json->sendJson(array("result"=>0, "html"=>$this->createFullResponse($bl, true, true))); } else { $this->view->obj = $bl; @@ -624,7 +624,7 @@ class PlaylistController extends Zend_Controller_Action $result = $bl->shuffleSmartBlock(); $this->view->result = $result["result"]; - $this->createUpdateResponse($bl); + $this->createUpdateResponse($bl,true); /* if ($result['result'] == 0) { @@ -652,7 +652,7 @@ class PlaylistController extends Zend_Controller_Action $result = $pl->shuffle(); $this->view->result = $result["result"]; - $this->createUpdateResponse($pl); + $this->createUpdateResponse($pl,true); /* if ($result['result'] == 0) { $this->_helper->json->sendJson(array( 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 032ae669f..7e9a954aa 100644 --- a/airtime_mvc/application/views/scripts/form/smart-block-criteria.phtml +++ b/airtime_mvc/application/views/scripts/form/smart-block-criteria.phtml @@ -120,7 +120,9 @@ - showPoolCount) { ?> + showPoolCount) { ?>
contents; $isStaticSmartBlock = ($this->obj instanceof Application_Model_Block && $this->obj->isStatic()); $isPlaylist = ($this->obj instanceof Application_Model_Playlist); +if ($this->poolCount) { ?> +
+ + poolCount > 1) { + echo $this->poolCount; + ?> + + + + poolCount == 1) { + echo $this->poolCount; + ?> + + + + + 0 + + + +
+ partial('playlist/set-fade.phtml', $vars); + ?>
From 927fcbc42d9871080ff7bd8323692b2ec611f3f5 Mon Sep 17 00:00:00 2001 From: Robb Ebright Date: Wed, 3 Jan 2018 18:57:02 -0500 Subject: [PATCH 2/6] Pluralized file criteria, cleaned up CSS and removed dead code --- .../controllers/PlaylistController.php | 1 + .../application/forms/SmartBlockCriteria.php | 3 +- .../scripts/form/smart-block-criteria.phtml | 31 -------------- .../views/scripts/playlist/update.phtml | 40 ++++++++----------- airtime_mvc/public/css/styles.css | 3 ++ 5 files changed, 22 insertions(+), 56 deletions(-) diff --git a/airtime_mvc/application/controllers/PlaylistController.php b/airtime_mvc/application/controllers/PlaylistController.php index 0fde85f88..4c63d73e5 100644 --- a/airtime_mvc/application/controllers/PlaylistController.php +++ b/airtime_mvc/application/controllers/PlaylistController.php @@ -67,6 +67,7 @@ class PlaylistController extends Zend_Controller_Action if ($formIsValid) { $this->view->poolCount = $obj->getListofFilesMeetCriteria()['count']; } + $this->view->showPoolCount = true; $this->view->html = $this->view->render('playlist/update.phtml'); $this->view->name = $obj->getName(); $this->view->description = $obj->getDescription(); diff --git a/airtime_mvc/application/forms/SmartBlockCriteria.php b/airtime_mvc/application/forms/SmartBlockCriteria.php index 25070006b..bc274e5a3 100644 --- a/airtime_mvc/application/forms/SmartBlockCriteria.php +++ b/airtime_mvc/application/forms/SmartBlockCriteria.php @@ -361,8 +361,7 @@ 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->getCriteriaOptions()), 'poolCount' => $files['count'], 'modRowMap' => $modRowMap, - 'showPoolCount' => $showPoolCount)) + 'criteriasLength' => count($this->getCriteriaOptions()), 'modRowMap' => $modRowMap)) )); } 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 7e9a954aa..9a1c31c07 100644 --- a/airtime_mvc/application/views/scripts/form/smart-block-criteria.phtml +++ b/airtime_mvc/application/views/scripts/form/smart-block-criteria.phtml @@ -119,37 +119,6 @@ - - showPoolCount) { ?> -
- - poolCount > 1) { - echo $this->poolCount; - ?> - - - - poolCount == 1) { - echo $this->poolCount; - ?> - - - - - 0 - - - -
- diff --git a/airtime_mvc/application/views/scripts/playlist/update.phtml b/airtime_mvc/application/views/scripts/playlist/update.phtml index b36de3a46..2f494bbdc 100644 --- a/airtime_mvc/application/views/scripts/playlist/update.phtml +++ b/airtime_mvc/application/views/scripts/playlist/update.phtml @@ -2,35 +2,29 @@ $items = $this->contents; $isStaticSmartBlock = ($this->obj instanceof Application_Model_Block && $this->obj->isStatic()); $isPlaylist = ($this->obj instanceof Application_Model_Playlist); -if ($this->poolCount) { ?> +?>
- - poolCount > 1) { - echo $this->poolCount; - ?> - - +poolCount) { ?> + + poolCount > 0) { + echo $this->poolCount; + echo ngettext(" file meets the criteria", " files meets the criteria", $this->poolCount); + } + ?> + poolCount == 1) { - echo $this->poolCount; - ?> - - - - - 0 - - - showPoolCount){ + ?> + +
- Date: Mon, 8 Jan 2018 18:42:55 -0500 Subject: [PATCH 3/6] Merge changes from playlist preview to avoid conflicts --- .../views/scripts/playlist/update.phtml | 24 +------------------ 1 file changed, 1 insertion(+), 23 deletions(-) diff --git a/airtime_mvc/application/views/scripts/playlist/update.phtml b/airtime_mvc/application/views/scripts/playlist/update.phtml index 2f494bbdc..5673c1fa9 100644 --- a/airtime_mvc/application/views/scripts/playlist/update.phtml +++ b/airtime_mvc/application/views/scripts/playlist/update.phtml @@ -2,29 +2,7 @@ $items = $this->contents; $isStaticSmartBlock = ($this->obj instanceof Application_Model_Block && $this->obj->isStatic()); $isPlaylist = ($this->obj instanceof Application_Model_Playlist); -?> -
-poolCount) { ?> - - poolCount > 0) { - echo $this->poolCount; - echo ngettext(" file meets the criteria", " files meets the criteria", $this->poolCount); - } - ?> - - - showPoolCount){ - ?> - - -
- Date: Mon, 8 Jan 2018 18:45:14 -0500 Subject: [PATCH 4/6] Resolve variable name for isSmartBlock vs. isStaticSmartblock to avoid conflict --- airtime_mvc/application/views/scripts/playlist/update.phtml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/airtime_mvc/application/views/scripts/playlist/update.phtml b/airtime_mvc/application/views/scripts/playlist/update.phtml index 5673c1fa9..b9e9aca2d 100644 --- a/airtime_mvc/application/views/scripts/playlist/update.phtml +++ b/airtime_mvc/application/views/scripts/playlist/update.phtml @@ -3,7 +3,7 @@ $items = $this->contents; $isStaticSmartBlock = ($this->obj instanceof Application_Model_Block && $this->obj->isStatic()); $isPlaylist = ($this->obj instanceof Application_Model_Playlist); -if (count($items) && ($isStaticSmartBlock || $isPlaylist)) : ?> +if (count($items) && ($isSmartBlock || $isPlaylist)) : ?> Date: Mon, 8 Jan 2018 18:45:27 -0500 Subject: [PATCH 5/6] Resolve variable name for isSmartBlock vs. isStaticSmartblock to avoid conflict --- airtime_mvc/application/views/scripts/playlist/update.phtml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/airtime_mvc/application/views/scripts/playlist/update.phtml b/airtime_mvc/application/views/scripts/playlist/update.phtml index b9e9aca2d..8f60a3eff 100644 --- a/airtime_mvc/application/views/scripts/playlist/update.phtml +++ b/airtime_mvc/application/views/scripts/playlist/update.phtml @@ -1,6 +1,6 @@ contents; -$isStaticSmartBlock = ($this->obj instanceof Application_Model_Block && $this->obj->isStatic()); +$isSmartBlock = ($this->obj instanceof Application_Model_Block); $isPlaylist = ($this->obj instanceof Application_Model_Playlist); if (count($items) && ($isSmartBlock || $isPlaylist)) : ?> From c8ba86648465f14a7f1958bdafe6fb0ddbc18e83 Mon Sep 17 00:00:00 2001 From: Robbt Date: Mon, 8 Jan 2018 18:47:21 -0500 Subject: [PATCH 6/6] Removing carriage return to attempt to try to avoid merge conflict in github UI --- airtime_mvc/application/views/scripts/playlist/update.phtml | 1 - 1 file changed, 1 deletion(-) diff --git a/airtime_mvc/application/views/scripts/playlist/update.phtml b/airtime_mvc/application/views/scripts/playlist/update.phtml index 8f60a3eff..a1dbc8824 100644 --- a/airtime_mvc/application/views/scripts/playlist/update.phtml +++ b/airtime_mvc/application/views/scripts/playlist/update.phtml @@ -2,7 +2,6 @@ $items = $this->contents; $isSmartBlock = ($this->obj instanceof Application_Model_Block); $isPlaylist = ($this->obj instanceof Application_Model_Playlist); - if (count($items) && ($isSmartBlock || $isPlaylist)) : ?>