Skip to content
Snippets Groups Projects
Commit 993e7eee authored by Vincent Petry's avatar Vincent Petry
Browse files

Keep update page when there are warnings

Whenever there were warnings during an update, the page will not be
redirected any more.
parent 645600ae
No related branches found
No related tags found
No related merge requests found
......@@ -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);
}
});
},
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment