Skip to content

Commit c168182

Browse files
authored
Merge pull request #254 from GwnDaan/display-error-on-update
Display when error occured on update
2 parents c5856f4 + ec97a5b commit c168182

File tree

2 files changed

+7
-2
lines changed

2 files changed

+7
-2
lines changed

web_app/server.py

+1
Original file line numberDiff line numberDiff line change
@@ -272,6 +272,7 @@ def check_update(source_url = None, current_release = None, prerelease=False, em
272272

273273
except Exception as e:
274274
print("Check update error: ", e)
275+
new_release = { "error" : repr(e)}
275276

276277
if emit:
277278
socketio.emit("new release", json.dumps(new_release), namespace="/test")

web_app/static/settings.js

+6-2
Original file line numberDiff line numberDiff line change
@@ -376,8 +376,12 @@ $(document).ready(function () {
376376
socket.on("new release", function(msg) {
377377
// open modal box asking for starting update
378378
response = JSON.parse(msg);
379-
console.log(response);
380-
if (response.new_release) {
379+
console.log(JSON.stringify(response));
380+
if (response.error) {
381+
$("#updateModal .modal-title").text("Update error!");
382+
$("#updateModal .modal-body").append(response['error']);
383+
$("#updateModal").modal();
384+
}else if (response.new_release) {
381385
$("#updateModal .modal-title").text("Update available!");
382386
$("#updateModal .modal-body").append('<p class="text-center">Do you want to install <b>' + response['new_release'] +'</b>? <br>It will take a few minutes.</p>');
383387
var newFeaturesArray = response['comment'].split('\r\n');

0 commit comments

Comments
 (0)