@@ -231,8 +231,9 @@ frappe.request.cleanup = function(opts, r) { | |||||
// show messages | // show messages | ||||
if(r._server_messages && !opts.silent) { | if(r._server_messages && !opts.silent) { | ||||
r._server_messages = JSON.parse(r._server_messages) | |||||
msgprint(r._server_messages); | |||||
r._server_messages = JSON.parse(r._server_messages); | |||||
frappe.hide_msgprint(); | |||||
frappe.msgprint(r._server_messages); | |||||
} | } | ||||
// show errors | // show errors | ||||
@@ -140,6 +140,7 @@ frappe.msgprint = function(msg, title) { | |||||
} | } | ||||
frappe.hide_msgprint = function(instant) { | frappe.hide_msgprint = function(instant) { | ||||
msg_dialog.msg_area.empty(); | |||||
if(msg_dialog && msg_dialog.$wrapper.is(":visible")) { | if(msg_dialog && msg_dialog.$wrapper.is(":visible")) { | ||||
if(instant) { | if(instant) { | ||||
msg_dialog.$wrapper.removeClass("fade"); | msg_dialog.$wrapper.removeClass("fade"); | ||||
@@ -3,8 +3,8 @@ | |||||
<input class="input-upload-file hidden" type="file" name="filedata" /> | <input class="input-upload-file hidden" type="file" name="filedata" /> | ||||
<button class="btn btn-primary btn-sm btn-browse">{%= __("Browse") %}</button> | <button class="btn btn-primary btn-sm btn-browse">{%= __("Browse") %}</button> | ||||
</div> | </div> | ||||
<div class="uploaded-filename hidden" style="width: calc(100% - 67px);"></div> | |||||
<div class="web-link-wrapper" style="width: calc(100% - 67px);"> | |||||
<div class="uploaded-filename hidden" style="width: calc(100% - 80px);"></div> | |||||
<div class="web-link-wrapper" style="width: calc(100% - 80px);"> | |||||
<span class="text-muted file-upload-or">{%= __("or") %}</span> | <span class="text-muted file-upload-or">{%= __("or") %}</span> | ||||
<div class="input-link" style="width: calc(100% - 30px);"> | <div class="input-link" style="width: calc(100% - 30px);"> | ||||
<div class="input-group"> | <div class="input-group"> | ||||
@@ -161,8 +161,9 @@ frappe.upload = { | |||||
"method": "uploadfile", | "method": "uploadfile", | ||||
args: args, | args: args, | ||||
callback: function(r) { | callback: function(r) { | ||||
if(!r._server_messages) | |||||
if(!r._server_messages) { | |||||
msgbox.hide(); | msgbox.hide(); | ||||
} | |||||
if(r.exc) { | if(r.exc) { | ||||
// if no onerror, assume callback will handle errors | // if no onerror, assume callback will handle errors | ||||
opts.onerror ? opts.onerror(r) : opts.callback(null, null, r); | opts.onerror ? opts.onerror(r) : opts.callback(null, null, r); | ||||