Merge branch 'master' of dev.sourcefabric.org:airtime

This commit is contained in:
martin 2011-02-11 18:13:38 -05:00
commit 6cf4310c24
11 changed files with 44 additions and 23 deletions

View file

@ -120,7 +120,9 @@ class PlaylistController extends Zend_Controller_Action
$formdata = $form->getValues();
$pl = $this->getPlaylist();
$pl->setName($formdata["title"]);
if($formdata["title"])
$pl->setName($formdata["title"]);
if(isset($formdata["description"])) {
$pl->setPLMetaData(UI_MDATA_KEY_DESCRIPTION, $formdata["description"]);

View file

@ -24,22 +24,18 @@ class PreferenceController extends Zend_Controller_Action
}
$form = new Application_Form_Preferences();
if (!$form->isValid($request->getPost())) {
if ($form->isValid($request->getPost())) {
} else {
$values = $form->getValues();
Application_Model_Preference::SetHeadTitle($values["stationName"], $this->view);
Application_Model_Preference::SetHeadTitle($values["stationName"], $this->view);
Application_Model_Preference::SetDefaultFade($values["stationDefaultFade"]);
$this->view->statusMsg = "Preferences Updated.";
}
$this->view->form = $form;
return $this->render('index'); //render the phtml file
}
}