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

Merge branch '2.4.x' of dev.sourcefabric.org:airtime into 2.4.x

This commit is contained in:
Naomi Aro 2013-06-20 14:03:56 -04:00
parent 6b0ab535e5 3f9e756912
commit 157f66bb74
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
airtime_mvc/public/js/airtime/showbuilder/builder.js
View File

@ -485,7 +485,7 @@ var AIRTIME = (function(AIRTIME){
$image,
$div,
headerIcon;
fnPrepareSeparatorRow = function fnPrepareSeparatorRow(sRowContent, sClass, iNodeIndex) {
$node = $(nRow.children[iNodeIndex]);
$node.html(sRowContent);
@ -620,7 +620,7 @@ var AIRTIME = (function(AIRTIME){
}
$node = $(nRow.children[0]);
if (aData.allowed === true && aData.scheduled >= 1) {
if (aData.allowed === true && aData.scheduled >= 1 && aData.linked_allowed) {
$node.html('<input type="checkbox" name="'+aData.id+'"></input>');
}
else {
@ -841,7 +841,7 @@ var AIRTIME = (function(AIRTIME){
});
$sbTable.find("tbody").on("click", "input:checkbox", function(ev) {
var $cb = $(this),
$tr = $cb.parents("tr"),
$prev;