CC-84: Smart Playlists

- propel usage chage
- cleaning up code
- some js changes
This commit is contained in:
James 2012-07-18 11:52:09 -04:00
parent 0aae7c75ae
commit 2a38527161
8 changed files with 171 additions and 151 deletions

View file

@ -90,18 +90,10 @@ class Application_Form_SmartPlaylistCriteria extends Zend_Form_SubForm
"minutes" => "minutes",
"items" => "items"
);
$this->setDecorators(array(
array('ViewScript', array('viewScript' => 'form/smart-playlist-criteria.phtml',
'criteriasLength' => count($criteriaOptions)))
));
// load type
$c = new Criteria();
$c->add(CcPlaylistPeer::ID, $p_playlistId);
$out = CcPlaylistPeer::doSelect($c);
if ($out[0]->getDbType() == "static") {
$out = CcPlaylistQuery::create()->findPk($p_playlistId);
if ($out->getDbType() == "static") {
$playlistType = 0;
} else {
$playlistType = 1;
@ -118,9 +110,7 @@ class Application_Form_SmartPlaylistCriteria extends Zend_Form_SubForm
$this->addElement($spType);
// load criteria from db
$c = new Criteria();
$c->add(CcPlaylistcriteriaPeer::PLAYLIST_ID, $p_playlistId);
$out = CcPlaylistcriteriaPeer::doSelect($c);
$out = CcPlaylistcriteriaQuery::create()->findByDbPlaylistId($p_playlistId);
$storedCrit = array();
foreach ($out as $crit) {
@ -136,6 +126,11 @@ class Application_Form_SmartPlaylistCriteria extends Zend_Form_SubForm
}
}
$openSmartPlaylistOption = false;
if (!empty($storedCrit)) {
$openSmartPlaylistOption = true;
}
$numElements = count($criteriaOptions);
for ($i = 0; $i < $numElements; $i++) {
$criteriaType = "";
@ -233,7 +228,10 @@ class Application_Form_SmartPlaylistCriteria extends Zend_Form_SubForm
$shuffle->setLabel('Shuffle');
$shuffle->setDecorators(array('viewHelper'));
$this->addElement($shuffle);
$this->setDecorators(array(
array('ViewScript', array('viewScript' => 'form/smart-playlist-criteria.phtml', "openOption"=> $openSmartPlaylistOption,
'criteriasLength' => count($criteriaOptions)))
));
}
}