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

CC-5405: When editing a single show instance from a repeating series, should not create a new cc_show

Browse source 
- Fixed resizing repeating shows to not include edited instances
- Fixed context menu on repeating shows with edited instances
- Fixed populated the show form when editing a single instance
This commit is contained in:
drigato 2013-12-02 07:19:31 -05:00
parent a465b5a770
commit ef8af1b724
4 changed files with 146 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

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

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