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

CC-4924: Calendar: "View Recorded File Metadata" for record show still uses old Metadata Editor 

-fixed
This commit is contained in:
denise 2013-02-14 11:43:29 -05:00
parent 74291cc248
commit cd5f1149af
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
airtime_mvc/public/js/airtime/library/library.js
View File

@ -1368,7 +1368,12 @@ $(document).ready(function() {
data = $("#edit-md-dialog form").serializeArray(); data = $("#edit-md-dialog form").serializeArray();
$.post(baseUrl+'library/edit-file-md', {format: "json", id: file_id, data: data}, function() { $.post(baseUrl+'library/edit-file-md', {format: "json", id: file_id, data: data}, function() {
$("#edit-md-dialog").dialog().remove(); $("#edit-md-dialog").dialog().remove();
oTable.fnStandingRedraw();
// don't redraw the library table if we are on calendar page
// we would be on calendar if viewing recorded file metadata
if ($("#schedule_calendar").length === 0) {
oTable.fnStandingRedraw();
}
}); });
}); });

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

@ -399,7 +399,7 @@ $(document).ready(function() {
oItems.edit.callback = callback; oItems.edit.callback = callback;
} }
} }
//define a content callback. //define a content callback.
if (oItems.content !== undefined) { if (oItems.content !== undefined) {
@ -440,9 +440,11 @@ $(document).ready(function() {
//define a view recorded callback. //define a view recorded callback.
if (oItems.view_recorded !== undefined) { if (oItems.view_recorded !== undefined) {
callback = function() { callback = function() {
document.location.href = oItems.view_recorded.url; $.get(oItems.view_recorded.url, {format: "json"}, function(json){
//in library.js
buildEditMetadataDialog(json);
});
}; };
oItems.view_recorded.callback = callback; oItems.view_recorded.callback = callback;
} }