Merge branch 'devel' of dev.sourcefabric.org:airtime into devel

Conflicts:
	airtime_mvc/public/js/airtime/schedule/add-show.js
This commit is contained in:
James 2012-04-05 16:03:15 -04:00
commit 332c1d91b5
9 changed files with 44 additions and 59 deletions

View file

@ -321,7 +321,7 @@ function setAddShowEvents() {
applyPlatformOpacityRules: false
});
var action = "/Schedule/"+addShowButton.attr("data-action");
var action = "/Schedule/"+String(addShowButton.attr("data-action"));
$.post(action, {format: "json", data: data, hosts: hosts, days: days}, function(json){
//addShowButton.removeClass("disabled");