Congegni/sintonia
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch '2.5.x' into cc-5594-date_default

Browse source
This commit is contained in:
Naomi 2013-12-05 15:13:54 -05:00
commit b1842fff34
1 changed files with 6 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

7
airtime_mvc/application/services/CalendarService.php
View file

@ -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"),
@ -233,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"));
}