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

Merge branch 'master' of dev.sourcefabric.org:airtime

Browse source
This commit is contained in:
Naomi 2013-05-15 15:39:07 -04:00
commit 10154ae724
11 changed files with 135 additions and 47 deletions
Download patch file Download diff file Expand all files Collapse all files

8
airtime_mvc/public/js/airtime/schedule/schedule.js
View file

@ -137,7 +137,7 @@ function findViewportDimensions() {
};
}
function buildScheduleDialog (json) {
function buildScheduleDialog (json, instance_id) {
var dialog = $(json.dialog),
viewport = findViewportDimensions(),
height = Math.floor(viewport.height * 0.96),
@ -179,6 +179,10 @@ function buildScheduleDialog (json) {
//set the start end times so the builder datatables knows its time range.
fnServer.start = json.start;
fnServer.end = json.end;
fnServer.ops = {};
fnServer.ops.showFilter = 0;
fnServer.ops.showInstanceFilter = instance_id;
fnServer.ops.myShows = 0;
AIRTIME.library.libraryInit();
AIRTIME.showbuilder.builderDataTable();
@ -352,7 +356,7 @@ $(document).ready(function() {
callback = function() {
$.post(oItems.schedule.url, {format: "json", id: data.id}, function(json){
buildScheduleDialog(json);
buildScheduleDialog(json, data.id);
});
};

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

@ -359,6 +359,7 @@ var AIRTIME = (function(AIRTIME){
if (mod.fnServerData.hasOwnProperty("ops")) {
aoData.push( { name: "myShows", value: mod.fnServerData.ops.myShows} );
aoData.push( { name: "showFilter", value: mod.fnServerData.ops.showFilter} );
aoData.push( { name: "showInstanceFilter", value: mod.fnServerData.ops.showInstanceFilter} );
}
$.ajax({

1
airtime_mvc/public/js/airtime/showbuilder/main_builder.js
View file

@ -266,6 +266,7 @@ AIRTIME = (function(AIRTIME) {
if (fn.hasOwnProperty("ops")) {
data["myShows"] = fn.ops.myShows;
data["showFilter"] = fn.ops.showFilter;
data["showFilter"] = fn.ops.showInstanceFilter;
}
$.ajax( {