From 36d9b15435a4948162e22e1158e4725ad0ff9cf0 Mon Sep 17 00:00:00 2001
From: Naomi Aro <naomiaro@gmail.com>
Date: Thu, 8 Dec 2011 17:49:00 +0100
Subject: [PATCH] CC-3150 : Editor box still open with show details for a
 deleted show

---
 .../controllers/ScheduleController.php          | 17 ++++++++++++-----
 .../airtime/schedule/full-calendar-functions.js |  8 ++++++++
 2 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/airtime_mvc/application/controllers/ScheduleController.php b/airtime_mvc/application/controllers/ScheduleController.php
index 84ab1641a..cb034d758 100644
--- a/airtime_mvc/application/controllers/ScheduleController.php
+++ b/airtime_mvc/application/controllers/ScheduleController.php
@@ -141,15 +141,19 @@ class ScheduleController extends Zend_Controller_Action
 		$userInfo = Zend_Auth::getInstance()->getStorage()->read();
 		$user = new Application_Model_User($userInfo->id);
 
-        if($user->isUserType(array(UTYPE_ADMIN, UTYPE_PROGRAM_MANAGER))) {
-            try{
+        if ($user->isUserType(array(UTYPE_ADMIN, UTYPE_PROGRAM_MANAGER))) {
+
+            try {
 		      $showInstance = new Application_Model_ShowInstance($showInstanceId);
-            }catch(Exception $e){
+            }
+            catch(Exception $e){
                 $this->view->show_error = true;
                 return false;
             }
 
 		    $showInstance->delete();
+
+		    $this->view->show_id = $showInstance->getShowId();
         }
     }
 
@@ -801,15 +805,18 @@ class ScheduleController extends Zend_Controller_Action
         if($user->isUserType(array(UTYPE_ADMIN, UTYPE_PROGRAM_MANAGER))) {
 		    $showInstanceId = $this->_getParam('id');
 
-		    try{
+		    try {
                 $showInstance = new Application_Model_ShowInstance($showInstanceId);
-		    }catch(Exception $e){
+		    }
+		    catch(Exception $e){
                 $this->view->show_error = true;
                 return false;
             }
             $show = new Application_Model_Show($showInstance->getShowId());
 
             $show->cancelShow($showInstance->getShowInstanceStart());
+
+            $this->view->show_id = $showInstance->getShowId();
         }
     }
 
diff --git a/airtime_mvc/public/js/airtime/schedule/full-calendar-functions.js b/airtime_mvc/public/js/airtime/schedule/full-calendar-functions.js
index 7910f498f..a7640eb5e 100644
--- a/airtime_mvc/public/js/airtime/schedule/full-calendar-functions.js
+++ b/airtime_mvc/public/js/airtime/schedule/full-calendar-functions.js
@@ -8,6 +8,14 @@ function scheduleRefetchEvents(json) {
     if(json.show_error == true){
         alert("The show instance doesn't exist anymore!")
     }
+    if(json.show_id) {
+    	var dialog_id = parseInt($("#add_show_id").val(), 10);
+    	
+    	//if you've deleted the show you are currently editing, close the add show dialog.
+    	if (dialog_id === json.show_id) {
+    		$("#add-show-close").click();
+    	}
+    }
     $("#schedule_calendar").fullCalendar( 'refetchEvents' );
 }