From ab435ce3ec39b7b894c1fd0161e696fb8608a9c4 Mon Sep 17 00:00:00 2001 From: drigato Date: Wed, 4 Dec 2013 14:50:22 -0500 Subject: [PATCH 1/2] CC-5598: Deleting an edited, repeated instance deletes the entire show Fixed by setting the correct url action --- airtime_mvc/application/services/CalendarService.php | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/airtime_mvc/application/services/CalendarService.php b/airtime_mvc/application/services/CalendarService.php index edb76ebf5..55ad22c73 100644 --- a/airtime_mvc/application/services/CalendarService.php +++ b/airtime_mvc/application/services/CalendarService.php @@ -184,6 +184,11 @@ class Application_Service_CalendarService "name"=> _("Delete This Instance and All Following"), "icon" => "delete", "url" => $baseUrl."schedule/delete-show"); + } elseif ($populateInstance) { + $menu["del"] = array( + "name"=> _("Delete"), + "icon" => "delete", + "url" => $baseUrl."schedule/delete-show-instance"); } else { $menu["del"] = array( "name"=> _("Delete"), From 86ed77a106f1603837ade6d744fe5888773f818d Mon Sep 17 00:00:00 2001 From: drigato Date: Wed, 4 Dec 2013 15:02:14 -0500 Subject: [PATCH 2/2] CC-5599: Can drag and drop an edited repeating instance on calendar Fixed by properly checking if a show is repeating or not --- airtime_mvc/application/services/CalendarService.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/airtime_mvc/application/services/CalendarService.php b/airtime_mvc/application/services/CalendarService.php index 55ad22c73..a413f3b45 100644 --- a/airtime_mvc/application/services/CalendarService.php +++ b/airtime_mvc/application/services/CalendarService.php @@ -238,7 +238,7 @@ class Application_Service_CalendarService throw new Exception(_("Permission denied")); } - if ($this->ccShow->getFirstCcShowDay()->isRepeating()) { + if ($this->ccShow->isRepeating()) { throw new Exception(_("Can't drag and drop repeating shows")); }