CC-5210: "Linked" Icon is missing after adding contents into linked show
-fixed
This commit is contained in:
parent
311e0c103d
commit
b18495a79e
3 changed files with 13 additions and 5 deletions
|
@ -1069,13 +1069,13 @@ function buildEditMetadataDialog (json){
|
||||||
width: 460,
|
width: 460,
|
||||||
height: 660,
|
height: 660,
|
||||||
modal: true,
|
modal: true,
|
||||||
close: closeDialog
|
close: closeDialogLibrary
|
||||||
});
|
});
|
||||||
|
|
||||||
dialog.dialog('open');
|
dialog.dialog('open');
|
||||||
}
|
}
|
||||||
|
|
||||||
function closeDialog(event, ui) {
|
function closeDialogLibrary(event, ui) {
|
||||||
$(this).remove();
|
$(this).remove();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -12,7 +12,7 @@ var AIRTIME = (function(AIRTIME){
|
||||||
|
|
||||||
var serverTimezoneOffset = 0;
|
var serverTimezoneOffset = 0;
|
||||||
|
|
||||||
function closeDialog(event, ui) {
|
function closeDialogCalendar(event, ui) {
|
||||||
$("#schedule_calendar").fullCalendar( 'refetchEvents' );
|
$("#schedule_calendar").fullCalendar( 'refetchEvents' );
|
||||||
$(this).remove();
|
$(this).remove();
|
||||||
}
|
}
|
||||||
|
@ -161,7 +161,7 @@ function buildScheduleDialog (json, instance_id) {
|
||||||
resizable: false,
|
resizable: false,
|
||||||
draggable: true,
|
draggable: true,
|
||||||
modal: true,
|
modal: true,
|
||||||
close: closeDialog,
|
close: closeDialogCalendar,
|
||||||
buttons: [
|
buttons: [
|
||||||
{
|
{
|
||||||
text: $.i18n._("Ok"),
|
text: $.i18n._("Ok"),
|
||||||
|
@ -214,7 +214,7 @@ function buildContentDialog (json){
|
||||||
width: width,
|
width: width,
|
||||||
height: height,
|
height: height,
|
||||||
modal: true,
|
modal: true,
|
||||||
close: closeDialog,
|
close: closeDialogCalendar,
|
||||||
buttons: [
|
buttons: [
|
||||||
{
|
{
|
||||||
text: $.i18n._("Ok"),
|
text: $.i18n._("Ok"),
|
||||||
|
|
|
@ -51,6 +51,14 @@ var AIRTIME = (function(AIRTIME){
|
||||||
|
|
||||||
var lastElem = json.schedule[json.schedule.length-1];
|
var lastElem = json.schedule[json.schedule.length-1];
|
||||||
var $elem = $("#fc-show-instance-"+instance_id);
|
var $elem = $("#fc-show-instance-"+instance_id);
|
||||||
|
|
||||||
|
//if the show is linked, then replace $elem to reference all linked
|
||||||
|
//instances
|
||||||
|
if ($elem.data("show-linked") == "1") {
|
||||||
|
var show_id = $elem.data("show-id");
|
||||||
|
$elem = $('*[data-show-id="'+show_id+'"]');
|
||||||
|
}
|
||||||
|
|
||||||
$elem.find(".show-empty, .show-partial-filled").remove();
|
$elem.find(".show-empty, .show-partial-filled").remove();
|
||||||
if (json.schedule[1].empty) {
|
if (json.schedule[1].empty) {
|
||||||
$elem
|
$elem
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue