diff options
| author | Robin McCorkell <rmccorkell@owncloud.com> | 2015-11-08 00:02:59 +0000 |
|---|---|---|
| committer | Robin McCorkell <rmccorkell@owncloud.com> | 2015-11-09 17:26:11 +0000 |
| commit | db3209a4d953d6b4a645975a29e67229fc4c94fe (patch) | |
| tree | dd1620c527162595dbfcd829e364fc14e68fad32 /settings | |
| parent | 3a754b68c7d65d3643ff1ab84268fc84dbc5c138 (diff) | |
| download | nextcloud-server-db3209a4d953d6b4a645975a29e67229fc4c94fe.tar.gz nextcloud-server-db3209a4d953d6b4a645975a29e67229fc4c94fe.zip | |
Properly detect setup check messages set in the HTML template
Diffstat (limited to 'settings')
| -rw-r--r-- | settings/js/admin.js | 64 |
1 files changed, 36 insertions, 28 deletions
diff --git a/settings/js/admin.js b/settings/js/admin.js index 9f7133c6571..eb3b756bf0f 100644 --- a/settings/js/admin.js +++ b/settings/js/admin.js @@ -174,38 +174,46 @@ $(document).ready(function(){ var messages = [].concat(check1, check2, check3); var $el = $('#postsetupchecks'); $el.find('.loading').addClass('hidden'); - if (messages.length === 0) { + + var hasMessages = false; + var $errorsEl = $el.find('.errors'); + var $warningsEl = $el.find('.warnings'); + var $infoEl = $el.find('.info'); + + for (var i = 0; i < messages.length; i++ ) { + switch(messages[i].type) { + case OC.SetupChecks.MESSAGE_TYPE_INFO: + $infoEl.append('<li>' + messages[i].msg + '</li>'); + break; + case OC.SetupChecks.MESSAGE_TYPE_WARNING: + $warningsEl.append('<li>' + messages[i].msg + '</li>'); + break; + case OC.SetupChecks.MESSAGE_TYPE_ERROR: + default: + $errorsEl.append('<li>' + messages[i].msg + '</li>'); + } + } + + if ($errorsEl.find('li').length > 0) { + $errorsEl.removeClass('hidden'); + hasMessages = true; + } + if ($warningsEl.find('li').length > 0) { + $warningsEl.removeClass('hidden'); + hasMessages = true; + } + if ($infoEl.find('li').length > 0) { + $infoEl.removeClass('hidden'); + hasMessages = true; + } + + if (hasMessages) { + $el.find('.hint').removeClass('hidden'); + } else { var securityWarning = $('#security-warning'); if (securityWarning.children('ul').children().length === 0) { $('#security-warning-state').find('span').removeClass('hidden'); } - } else { - var $errorsEl = $el.find('.errors'); - var $warningsEl = $el.find('.warnings'); - var $infoEl = $el.find('.info'); - for (var i = 0; i < messages.length; i++ ) { - switch(messages[i].type) { - case OC.SetupChecks.MESSAGE_TYPE_INFO: - $infoEl.append('<li>' + messages[i].msg + '</li>'); - break; - case OC.SetupChecks.MESSAGE_TYPE_WARNING: - $warningsEl.append('<li>' + messages[i].msg + '</li>'); - break; - case OC.SetupChecks.MESSAGE_TYPE_ERROR: - default: - $errorsEl.append('<li>' + messages[i].msg + '</li>'); - } - } - if ($errorsEl.find('li').length > 0) { - $errorsEl.removeClass('hidden'); - } - if ($warningsEl.find('li').length > 0) { - $warningsEl.removeClass('hidden'); - } - if ($infoEl.find('li').length > 0) { - $infoEl.removeClass('hidden'); - } - $el.find('.hint').removeClass('hidden'); } }); }); |