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

Merge branch 'saas' into saas-embed-player

Browse source 
Conflicts:
	airtime_mvc/application/configs/ACL.php
This commit is contained in:
drigato 2015-03-31 17:44:14 -04:00
commit 220f21ab22
29 changed files with 422 additions and 149 deletions
Download patch file Download diff file Expand all files Collapse all files

5
airtime_mvc/public/js/airtime/schedule/add-show.js
View file

@ -82,7 +82,7 @@ function closeAddShowForm(event) {
redrawAddShowForm($el, json.form);
});
makeAddShowButton();
}
@ -742,7 +742,7 @@ function setAddShowEvents(form) {
image = new FormData();
image.append('file', $('#add_show_logo')[0].files[0]);
}
$.ajax({
url: action,
data: {format: "json", data: data, hosts: hosts, days: days},
@ -784,6 +784,7 @@ function setAddShowEvents(form) {
} else {
redrawAddShowForm($addShowForm, json.newForm);
scheduleRefetchEvents(json);
$addShowForm.hide();
}
}
});