Browse Source

Keep update page when there are warnings

Whenever there were warnings during an update, the page will not be
redirected any more.
tags/v8.2beta1
Vincent Petry 9 years ago
parent
commit
993e7eeec7
1 changed files with 20 additions and 8 deletions
  1. 20
    8
      core/js/update.js

+ 20
- 8
core/js/update.js View File

@@ -22,6 +22,8 @@
return;
}

var hasWarnings = false;

this.$el = $el;

this._started = true;
@@ -40,6 +42,7 @@
});
updateEventSource.listen('notice', function(message) {
$('<span>').addClass('error').append(message).append('<br />').appendTo($el);
hasWarnings = true;
});
updateEventSource.listen('error', function(message) {
$('<span>').addClass('error').append(message).append('<br />').appendTo($el);
@@ -57,14 +60,23 @@
.appendTo($el);
});
updateEventSource.listen('done', function() {
// FIXME: use product name
$('<span>').addClass('bold')
.append('<br />')
.append(t('core', 'The update was successful. Redirecting you to ownCloud now.'))
.appendTo($el);
setTimeout(function () {
OC.redirect(OC.webroot);
}, 3000);
if (hasWarnings) {
$('<span>').addClass('bold')
.append('<br />')
.append(t('core', 'The update was successful. There were warnings.'))
.appendTo($el);
var message = t('core', 'Please reload the page.');
$('<span>').append('<br />').append(message).append('<br />').appendTo($el);
} else {
// FIXME: use product name
$('<span>').addClass('bold')
.append('<br />')
.append(t('core', 'The update was successful. Redirecting you to ownCloud now.'))
.appendTo($el);
setTimeout(function () {
OC.redirect(OC.webroot);
}, 3000);
}
});
},


Loading…
Cancel
Save