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

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

Browse source
This commit is contained in:
Albert Santoni 2013-12-09 16:27:06 -05:00
commit 0919915c6b
6 changed files with 57 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -128,34 +128,35 @@ class Application_Service_CalendarService
$excludeIds = $this->ccShow->getEditedRepeatingInstanceIds();
$isRepeating = true;
$isRepeating = $this->ccShow->isRepeating();
$populateInstance = false;
if (in_array($this->ccShowInstance->getDbId(), $excludeIds)) {
if ($isRepeating && in_array($this->ccShowInstance->getDbId(), $excludeIds)) {
$populateInstance = true;
$isRepeating = false;
}
if (!$this->ccShowInstance->isRebroadcast() && $isAdminOrPM) {
if ($isRepeating) {
$menu["edit"] = array(
"name" => _("Edit"),
"icon" => "edit",
"items" => array());
if ($populateInstance) {
$menu["edit"] = array(
"name" => _("Edit Show"),
"icon" => "edit",
"url" => $baseUrl."Schedule/populate-repeating-show-instance-form");
} else {
$menu["edit"] = array(
"name" => _("Edit"),
"icon" => "edit",
"items" => array());
$menu["edit"]["items"]["all"] = array(
"name" => _("Edit Show"),
"icon" => "edit",
"url" => $baseUrl."Schedule/populate-show-form");
$menu["edit"]["items"]["all"] = array(
"name" => _("Edit Show"),
"icon" => "edit",
"url" => $baseUrl."Schedule/populate-show-form");
$menu["edit"]["items"]["instance"] = array(
"name" => _("Edit This Instance"),
"icon" => "edit",
"url" => $baseUrl."Schedule/populate-repeating-show-instance-form");
} elseif ($populateInstance) {
$menu["edit"] = array(
"name" => _("Edit Show"),
"icon" => "edit",
"url" => $baseUrl."Schedule/populate-repeating-show-instance-form");
$menu["edit"]["items"]["instance"] = array(
"name" => _("Edit This Instance"),
"icon" => "edit",
"url" => $baseUrl."Schedule/populate-repeating-show-instance-form");
}
} else {
$menu["edit"] = array(
"name"=> _("Edit Show"),