From 993e7eeec7128fcf0c4ae1778e58ac4ea5703956 Mon Sep 17 00:00:00 2001
From: Vincent Petry <pvince81@owncloud.com>
Date: Tue, 7 Jul 2015 13:38:24 +0200
Subject: [PATCH] Keep update page when there are warnings
Whenever there were warnings during an update, the page will not be
redirected any more.
---
core/js/update.js | 28 ++++++++++++++++++++--------
1 file changed, 20 insertions(+), 8 deletions(-)
diff --git a/core/js/update.js b/core/js/update.js
index 60f0483293..fd3c7a56bd 100644
--- a/core/js/update.js
+++ b/core/js/update.js
@@ -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);
+ }
});
},
--
GitLab