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

Merge branch '2.5.x' of github.com:sourcefabric/Airtime into 2.5.x

This commit is contained in:
Albert Santoni 2013-12-04 15:09:52 -05:00
parent 771d07c4cc 86ed77a106
commit f695d7b895
1 changed files with 6 additions and 1 deletions
Show Stats 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"), "name"=> _("Delete This Instance and All Following"),
"icon" => "delete", "icon" => "delete",
"url" => $baseUrl."schedule/delete-show"); "url" => $baseUrl."schedule/delete-show");
} elseif ($populateInstance) {
$menu["del"] = array(
"name"=> _("Delete"),
"icon" => "delete",
"url" => $baseUrl."schedule/delete-show-instance");
} else { } else {
$menu["del"] = array( $menu["del"] = array(
"name"=> _("Delete"), "name"=> _("Delete"),
@ -233,7 +238,7 @@ class Application_Service_CalendarService
throw new Exception(_("Permission denied")); throw new Exception(_("Permission denied"));
} }
if ($this->ccShow->getFirstCcShowDay()->isRepeating()) { if ($this->ccShow->isRepeating()) {
throw new Exception(_("Can't drag and drop repeating shows")); throw new Exception(_("Can't drag and drop repeating shows"));
} }