All new accounts created on Gitlab now require administrator approval. If you invite any collaborators, please let Flux staff know so they can approve the accounts.

Commit 854eba86 authored by Leigh B Stoller's avatar Leigh B Stoller

Fix up snapshot error reporting in the oops modal.

parent 9a32224f
......@@ -31,7 +31,8 @@ window.ShowImagingModal = (function()
imaging_modal_active = false;
$('#imaging-modal').off('hidden.bs.modal');
}
sup.SpitOops("oops", "Server says: " + json.value);
sup.SpitOops("oops", "Server says: <br><pre><code>" +
json.value + "</code></pre>");
completion_callback(1);
return;
}
......
......@@ -1944,15 +1944,17 @@ $(function ()
//
function StartSnapshot(node_id, update_profile, update_prepare, imagename)
{
sup.ShowModal('#waitwait-modal');
sup.ShowWaitWait("Starting image capture, " +
"this can take a minute. Patience please.");
var callback = function(json) {
sup.HideModal('#waitwait-modal');
sup.HideWaitWait();
//console.log("StartSnapshot");
//console.log(json);
if (json.code) {
sup.SpitOops("oops", "Could not start snapshot: " + json.value);
sup.SpitOops("oops", "Could not start snapshot:<br>" +
"<pre><code>" + json.value + "</code></pre>");
return;
}
ShowProgressModal();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment