Merge pull request #17436 from owncloud/update-keeppageifwarnings

Keep update page when there are warnings

1 files changed, 20 insertions, 8 deletions

diff --git a/core/js/update.js b/core/js/update.js
index 60f04832935..fd3c7a56bd6 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);
+				}
 			});
 		},