summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Müller <thomas.mueller@tmit.eu>2016-02-08 16:45:32 +0100
committerThomas Müller <thomas.mueller@tmit.eu>2016-02-08 16:45:32 +0100
commita35d5625e0ff3e50ab18b4079c630837e8322ffd (patch)
tree6f2ef947c8fdd2066cc0a8ce1e68e49f7888a669
parentec399e6bbc5a16519433e11869e444fd7b198a25 (diff)
parent25aad470c159421ec523988e12832dcc78163f28 (diff)
downloadnextcloud-server-a35d5625e0ff3e50ab18b4079c630837e8322ffd.tar.gz
nextcloud-server-a35d5625e0ff3e50ab18b4079c630837e8322ffd.zip
Merge pull request #22186 from owncloud/show-different-unsupported-failure-message
Don't show "report this to the community" when the upgrade is unsuppo…
-rw-r--r--core/js/update.js16
1 files changed, 10 insertions, 6 deletions
diff --git a/core/js/update.js b/core/js/update.js
index 1626b6f2c49..77ac1bb20ff 100644
--- a/core/js/update.js
+++ b/core/js/update.js
@@ -60,12 +60,16 @@
updateEventSource.listen('failure', function(message) {
$(window).off('beforeunload.inprogress');
$('<span>').addClass('error').append(message).append('<br />').appendTo($el);
- $('<span>')
- .addClass('bold')
- .append(t('core', 'The update was unsuccessful. ' +
- 'Please report this issue to the ' +
- '<a href="https://github.com/owncloud/core/issues" target="_blank">ownCloud community</a>.'))
- .appendTo($el);
+ var span = $('<span>')
+ .addClass('bold');
+ if(message === 'Exception: Updates between multiple major versions and downgrades are unsupported.') {
+ span.append(t('core', 'The update was unsuccessful. For more information <a href="{url}">check our forum post</a> covering this issue.', {'url': 'https://forum.owncloud.org/viewtopic.php?f=17&t=32087'}));
+ } else {
+ span.append(t('core', 'The update was unsuccessful. ' +
+ 'Please report this issue to the ' +
+ '<a href="https://github.com/owncloud/core/issues" target="_blank">ownCloud community</a>.'));
+ }
+ span.appendTo($el);
});
updateEventSource.listen('done', function() {
$(window).off('beforeunload.inprogress');