CC-3059: Record and Rebroadcast: not able to set rebroadcast too close to
recorded show - fixed. - extra fix: layout was broken when error is displayed
This commit is contained in:
parent
6b7d7646c9
commit
e5ac2b75d4
2 changed files with 22 additions and 1 deletions
|
@ -730,6 +730,28 @@ class ScheduleController extends Zend_Controller_Action
|
||||||
Application_Model_Schedule::createNewFormSections($this->view);
|
Application_Model_Schedule::createNewFormSections($this->view);
|
||||||
|
|
||||||
$this->view->newForm = $this->view->render('schedule/add-show-form.phtml');
|
$this->view->newForm = $this->view->render('schedule/add-show-form.phtml');
|
||||||
|
}else{
|
||||||
|
$this->view->what = $formWhat;
|
||||||
|
$this->view->when = $formWhen;
|
||||||
|
$this->view->repeats = $formRepeats;
|
||||||
|
$this->view->who = $formWho;
|
||||||
|
$this->view->style = $formStyle;
|
||||||
|
$this->view->rr = $formRecord;
|
||||||
|
$this->view->absoluteRebroadcast = $formAbsoluteRebroadcast;
|
||||||
|
$this->view->rebroadcast = $formRebroadcast;
|
||||||
|
$this->view->addNewShow = true;
|
||||||
|
|
||||||
|
//the form still needs to be "update" since
|
||||||
|
//the validity test failed.
|
||||||
|
if ($data['add_show_id'] != -1){
|
||||||
|
$this->view->addNewShow = false;
|
||||||
|
}
|
||||||
|
if (!$startDateModified){
|
||||||
|
$formWhen->getElement('add_show_start_date')->setOptions(array('disabled' => true));
|
||||||
|
}
|
||||||
|
|
||||||
|
$this->view->form = $this->view->render('schedule/add-show-form.phtml');
|
||||||
|
|
||||||
}
|
}
|
||||||
}else{
|
}else{
|
||||||
$userInfo = Zend_Auth::getInstance()->getStorage()->read();
|
$userInfo = Zend_Auth::getInstance()->getStorage()->read();
|
||||||
|
|
|
@ -1516,7 +1516,6 @@ div.success{
|
||||||
list-style-type:none;
|
list-style-type:none;
|
||||||
margin:0 0 8px 0;
|
margin:0 0 8px 0;
|
||||||
padding:0;
|
padding:0;
|
||||||
height:25px;
|
|
||||||
display:block;
|
display:block;
|
||||||
}
|
}
|
||||||
/*
|
/*
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue