Merge pull request #23726 from owncloud/ldap-wizard-improve-status-indicator
LDAP Wizard: reset connection status indicator when switching LDAP co…
This commit is contained in:
commit
d8f327831e
|
@ -24,6 +24,8 @@ OCA = OCA || {};
|
||||||
STATUS_INCOMPLETE: 1,
|
STATUS_INCOMPLETE: 1,
|
||||||
/** @constant {number} */
|
/** @constant {number} */
|
||||||
STATUS_SUCCESS: 2,
|
STATUS_SUCCESS: 2,
|
||||||
|
/** @constant {number} */
|
||||||
|
STATUS_UNTESTED: 3,
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* initializes the instance. Always call it after creating the instance.
|
* initializes the instance. Always call it after creating the instance.
|
||||||
|
@ -210,6 +212,7 @@ OCA = OCA || {};
|
||||||
* @listens ConfigModel#configLoaded
|
* @listens ConfigModel#configLoaded
|
||||||
*/
|
*/
|
||||||
onConfigLoaded: function(view) {
|
onConfigLoaded: function(view) {
|
||||||
|
view._updateStatusIndicator(view.STATUS_UNTESTED);
|
||||||
view.basicStatusCheck(view);
|
view.basicStatusCheck(view);
|
||||||
view.functionalityCheck();
|
view.functionalityCheck();
|
||||||
},
|
},
|
||||||
|
@ -370,6 +373,14 @@ OCA = OCA || {};
|
||||||
var $indicatorLight = $('.ldap_config_state_indicator_sign');
|
var $indicatorLight = $('.ldap_config_state_indicator_sign');
|
||||||
|
|
||||||
switch(state) {
|
switch(state) {
|
||||||
|
case this.STATUS_UNTESTED:
|
||||||
|
$indicator.text(t('user_ldap',
|
||||||
|
'Testing configuration…'
|
||||||
|
));
|
||||||
|
$indicator.addClass('ldap_grey');
|
||||||
|
$indicatorLight.removeClass('error');
|
||||||
|
$indicatorLight.removeClass('success');
|
||||||
|
break;
|
||||||
case this.STATUS_ERROR:
|
case this.STATUS_ERROR:
|
||||||
$indicator.text(t('user_ldap',
|
$indicator.text(t('user_ldap',
|
||||||
'Configuration incorrect'
|
'Configuration incorrect'
|
||||||
|
|
Loading…
Reference in New Issue