pingu_98/MrDraw
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

System commands with ignore set to true also ignore http errors

Browse source
This commit is contained in:
Gina Häußge 2015-06-22 16:55:32 +02:00
parent a580482c29
commit 1a7193e113
1 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/octoprint/static/js/app/viewmodels/navigation.js
View file

@ -28,15 +28,17 @@ $(function() {
new PNotify({title: "Success", text: _.sprintf(gettext("The command \"%(command)s\" executed successfully"), {command: action.name}), type: "success"}); new PNotify({title: "Success", text: _.sprintf(gettext("The command \"%(command)s\" executed successfully"), {command: action.name}), type: "success"});
}, },
error: function(jqXHR, textStatus, errorThrown) { error: function(jqXHR, textStatus, errorThrown) {
var error = "<p>" + _.sprintf(gettext("The command \"%(command)s\" could not be executed."), {command: action.name}) + "</p>"; if (!action.hasOwnProperty("ignore") || !action.ignore) {
error += pnotifyAdditionalInfo("<pre>" + jqXHR.responseText + "</pre>"); var error = "<p>" + _.sprintf(gettext("The command \"%(command)s\" could not be executed."), {command: action.name}) + "</p>";
new PNotify({title: gettext("Error"), text: error, type: "error", hide: false}); error += pnotifyAdditionalInfo("<pre>" + jqXHR.responseText + "</pre>");
new PNotify({title: gettext("Error"), text: error, type: "error", hide: false});
}
} }
}) })
}; };
if (action.confirm) { if (action.confirm) {
showConfirmationDialog(action.confirm, function (e) { showConfirmationDialog(action.confirm, function (e) {
callback(); callback();
}); });
} else { } else {
callback(); callback();
@ -49,4 +51,4 @@ $(function() {
["loginStateViewModel", "appearanceViewModel", "settingsViewModel", "userSettingsViewModel"], ["loginStateViewModel", "appearanceViewModel", "settingsViewModel", "userSettingsViewModel"],
"#navbar" "#navbar"
]); ]);
}); });