Index: lams_tool_larsrc/web/pages/itemreview/instructionsnav.jsp =================================================================== diff -u -r2dd38c31c3e3fb4858c7ab7ac2d3143587a15949 -rc325b5f32102c66679ed0d7827c89bcc7671895d --- lams_tool_larsrc/web/pages/itemreview/instructionsnav.jsp (.../instructionsnav.jsp) (revision 2dd38c31c3e3fb4858c7ab7ac2d3143587a15949) +++ lams_tool_larsrc/web/pages/itemreview/instructionsnav.jsp (.../instructionsnav.jsp) (revision c325b5f32102c66679ed0d7827c89bcc7671895d) @@ -55,7 +55,7 @@ var url="?sessionMapID=${sessionMapID}&mode=${mode}&itemUid=${param.itemUid}&reqID="+reqIDVar.getTime(); jQuery.ajax({ type: 'GET', - dateType: 'script', + dataType: 'script', url: url, timeout: 5000, @@ -66,12 +66,19 @@ jQuery("input#FinishInstruction").addClass("disabled"); }, - error: function() { - alert('server timeout'); + error: function(jqXHR, textStatus, errorThrown) { + alert('Error while marking item as complete.\nStatus: ' + textStatus + '\nError: ' + errorThrown); }, - success: function(data) { - eval(data); + success: function() { + var winParent = window.parent; + if (!winParent.opener.checkNew) { + // there can be an extra iframe in the hierarchy + winParent = winParent.parent; + } + winParent.opener.checkNew(); + winParent.opener=null; + winParent.close(); }, complete: function() {