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

Merge branch 'cc-4961-show-linking'

Browse source 
Conflicts:
	airtime_mvc/application/controllers/ScheduleController.php
This commit is contained in:
denise 2013-04-29 15:35:16 -04:00
commit 71526a94cc
36 changed files with 3830 additions and 786 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -172,7 +172,6 @@ var AIRTIME = (function(AIRTIME){
};
mod.checkToolBarIcons = function() {
AIRTIME.library.checkAddButton();
mod.checkSelectButton();
mod.checkTrimButton();
@ -299,7 +298,6 @@ var AIRTIME = (function(AIRTIME){
};
mod.fnAdd = function(aMediaIds, aSchedIds) {
mod.disableUI();
$.post(baseUrl+"showbuilder/schedule-add",
@ -646,7 +644,7 @@ var AIRTIME = (function(AIRTIME){
//save some info for reordering purposes.
$nRow.data({"aData": aData});
if (aData.scheduled === 1) {
$nRow.addClass(NOW_PLAYING_CLASS);
}
@ -657,7 +655,7 @@ var AIRTIME = (function(AIRTIME){
$nRow.addClass("sb-future");
}
if (aData.allowed !== true) {
if (aData.allowed !== true || aData.linked_allowed === false) {
$nRow.addClass("sb-not-allowed");
}
else {