From e5ac2b75d4748b4db63b8f22965af92e1f11ff34 Mon Sep 17 00:00:00 2001
From: James <james@sourcefabric-DX4840.(none)>
Date: Fri, 18 Nov 2011 11:36:20 -0500
Subject: [PATCH] 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
---
 .../controllers/ScheduleController.php        | 22 +++++++++++++++++++
 airtime_mvc/public/css/styles.css             |  1 -
 2 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/airtime_mvc/application/controllers/ScheduleController.php b/airtime_mvc/application/controllers/ScheduleController.php
index 3896aa594..1a75f27e7 100644
--- a/airtime_mvc/application/controllers/ScheduleController.php
+++ b/airtime_mvc/application/controllers/ScheduleController.php
@@ -730,6 +730,28 @@ class ScheduleController extends Zend_Controller_Action
                     Application_Model_Schedule::createNewFormSections($this->view);
 
                     $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{
                 $userInfo = Zend_Auth::getInstance()->getStorage()->read();
diff --git a/airtime_mvc/public/css/styles.css b/airtime_mvc/public/css/styles.css
index 45078cbed..022b26a26 100644
--- a/airtime_mvc/public/css/styles.css
+++ b/airtime_mvc/public/css/styles.css
@@ -1516,7 +1516,6 @@ div.success{
 	list-style-type:none;
 	margin:0 0 8px 0;
 	padding:0;
-	height:25px;
 	display:block;
 }
 /*