aboutsummaryrefslogtreecommitdiffstats
path: root/core/js
diff options
context:
space:
mode:
authorMorris Jobke <hey@morrisjobke.de>2016-03-31 14:27:01 +0200
committerThomas Müller <thomas.mueller@tmit.eu>2016-04-04 12:34:18 +0200
commit1f7e02e4d4fa918d933b904abf12fca6fda2c526 (patch)
treef249b787f90207d0bc5bb37082954e6c03a136f5 /core/js
parent15339efd60ebcb4b140fc0e27f66ed9541f9d77f (diff)
downloadnextcloud-server-1f7e02e4d4fa918d933b904abf12fca6fda2c526.tar.gz
nextcloud-server-1f7e02e4d4fa918d933b904abf12fca6fda2c526.zip
Add detailed logs hidden and show them on request
Diffstat (limited to 'core/js')
-rw-r--r--core/js/update.js30
1 files changed, 23 insertions, 7 deletions
diff --git a/core/js/update.js b/core/js/update.js
index d15609ad471..31b97c56894 100644
--- a/core/js/update.js
+++ b/core/js/update.js
@@ -90,16 +90,16 @@
.removeClass('icon-loading-dark');
if (hasWarnings) {
- $('<span>')
- .append('<br />')
- .append(t('core', 'The update was successful. There were warnings.'))
- .appendTo($el);
+ $el.find('.update-show-detailed').before(
+ $('<span>')
+ .append('<br />')
+ .append(t('core', 'The update was successful. There were warnings.'))
+ );
var message = t('core', 'Please reload the page.');
- $('<span>').append('<br />').append(message).append('<br />').appendTo($el);
+ $('<span>').append(message).append('<br />').appendTo($el);
} else {
// FIXME: use product name
$('<span>')
- .append('<br />')
.append(t('core', 'The update was successful. Redirecting you to ownCloud now.'))
.appendTo($el);
setTimeout(function () {
@@ -111,19 +111,31 @@
setMessage: function(message) {
$('#update-progress-message').html(message);
+ $('#update-progress-detailed')
+ .append($('<span>'))
+ .append(message)
+ .append($('<br>'));
},
setPermanentMessage: function(message) {
$('#update-progress-message').html(message);
$('#update-progress-message-warnings')
.show()
- .append($('<ul>').append(message))
+ .append($('<ul>').append(message));
+ $('#update-progress-detailed')
+ .append($('<span>'))
+ .append(message)
+ .append($('<br>'));
},
setErrorMessage: function (message) {
$('#update-progress-message-error')
.show()
.html(message);
+ $('#update-progress-detailed')
+ .append($('<span>'))
+ .append(message)
+ .append($('<br>'));
}
};
@@ -143,4 +155,8 @@ $(document).ready(function() {
});
return false;
});
+ $('.update-show-detailed').on('click', function() {
+ $('#update-progress-detailed').toggleClass('hidden');
+ return false;
+ });
});