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

IM-629

Browse source 
-filter by using instance id instead of show id

Conflicts:
	airtime_mvc/application/models/Schedule.php
This commit is contained in:
Martin Konecny 2013-04-30 13:35:28 -04:00
parent af7b2d5347
commit bb36556bb9
6 changed files with 17 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -180,7 +180,8 @@ function buildScheduleDialog (json, instance_id) {
fnServer.start = json.start;
fnServer.end = json.end;
fnServer.ops = {};
fnServer.ops.showFilter = instance_id;
fnServer.ops.showFilter = 0;
fnServer.ops.showInstanceFilter = instance_id;
fnServer.ops.myShows = 0;
AIRTIME.library.libraryInit();
@ -354,8 +355,8 @@ $(document).ready(function() {
callback = function() {
$.post(oItems.schedule.url, {format: "json", id: data.showId}, function(json){
buildScheduleDialog(json, data.showId);
$.post(oItems.schedule.url, {format: "json", id: data.id}, function(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( {