Congegni
/
libretime
mirror of https://github.com/libretime/libretime.git
7
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Removed unused code. 

Changed linked show warning message in the edit show form.
This commit is contained in:
drigato 2014-08-21 17:12:54 -04:00
parent 10cb5484fe
commit 20a5649dbe
2 changed files with 1 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
airtime_mvc/application/services/SchedulerService.php
View File

@ -207,40 +207,6 @@ class Application_Service_SchedulerService
*/
public static function fillLinkedInstances($ccShow, $instanceIdsToFill, $instanceId=null)
{
//TODO can we remove the code until line 216 ??
/*
$instanceIds = $ccShow->getInstanceIdsSortedByMostRecentStartTime();
if (count($instanceIds) == 0) {
return;
}
//First check if any linked instances have content
//If all instances are empty then we don't need to fill
//any other instances with content
$doesAnyShowInstanceHaveContent = false;
foreach ($instanceIds as $instanceId)
{
$schedule_sql = "SELECT instance_id FROM cc_schedule ".
"WHERE instance_id=$instanceId";//#IN (".implode($instanceIds, ",").")";
$ccSchedules = Application_Common_Database::prepareAndExecute(
$schedule_sql);
if (count($ccSchedules) > 0) {
$doesAnyShowInstanceHaveContent = true;
break;
}
}
//variable out of scope outside foreach loop
unset($ccSchedules);
if ($doesAnyShowInstanceHaveContent == false)
{
//The linked shows are all empty, so there's nothing for us to do.
//(No content should be propagated to the other show instances...
return;
}
*/
//Get the "template" schedule for the linked show (contents of the linked show) that will be
//copied into to all the new show instances.
$linkedShowSchedule = self::getLinkedShowSchedule($ccShow->getDbId(), $instanceIdsToFill, $instanceId);

2
airtime_mvc/public/js/airtime/schedule/add-show.js
View File

@ -277,7 +277,7 @@ function setAddShowEvents(form) {
//only display the warning message if a show is being edited
if ($(".button-bar.bottom").find(".ui-button-text").text() === "Update show") {
if ($(this).attr("checked") && $("#show-link-warning").length === 0) {
$(this).parent().after("<ul id='show-link-warning' class='errors'><li>"+$.i18n._("Warning: A copy of the schedule from the show clicked on to edit this show will get copied to every other show in the repeat series.")+"</li></ul>");
$(this).parent().after("<ul id='show-link-warning' class='errors'><li>"+$.i18n._("Warning: All other repetitions of this show will have their contents replaced to match the show you selected 'Edit Show' with.")+"</li></ul>");
}
if (!$(this).attr("checked") && $("#show-link-warning").length !== 0) {