compile user and login filter on the first time automatically, if a suggestion was...

diff --git a/apps/user_ldap/js/wizard/wizardDetectorFilterLogin.js b/apps/user_ldap/js/wizard/wizardDetectorFilterLogin.js
index 310f261e05e516bb88cf81529dd416ac1487b846..e796b81e0eb2b8c5f09500c121e5ff89b176dc8d 100644 (file)
--- a/apps/user_ldap/js/wizard/wizardDetectorFilterLogin.js
+++ b/apps/user_ldap/js/wizard/wizardDetectorFilterLogin.js
@@ -23,6 +23,7 @@ OCA = OCA || {};
                                'ldap_loginfilter_attributes'
                        ]);
                        this.setTargetKey('ldap_login_filter');
+                       this.runsOnRequest = true;
 
                        this.wizardMethod = 'getUserLoginFilter';
                }

diff --git a/apps/user_ldap/js/wizard/wizardDetectorFilterUser.js b/apps/user_ldap/js/wizard/wizardDetectorFilterUser.js
index 63dff4e2985a8f2dda50e12c2c6901fe2488ed6f..d34e244a1f58adf63b580c78931e73a27a94b803 100644 (file)
--- a/apps/user_ldap/js/wizard/wizardDetectorFilterUser.js
+++ b/apps/user_ldap/js/wizard/wizardDetectorFilterUser.js
@@ -22,6 +22,7 @@ OCA = OCA || {};
                                'ldap_userfilter_objectclass'
                        ]);
                        this.setTargetKey('ldap_userlist_filter');
+                       this.runsOnRequest = true;
 
                        this.wizardMethod = 'getUserListFilter';
                }

diff --git a/apps/user_ldap/js/wizard/wizardTabAbstractFilter.js b/apps/user_ldap/js/wizard/wizardTabAbstractFilter.js
index e2ac55f07199616b3a0511490f263fe7b9ff0ecd..024b6af65d0302275ecf71a3feafb06c5e8fc128 100644 (file)
--- a/apps/user_ldap/js/wizard/wizardTabAbstractFilter.js
+++ b/apps/user_ldap/js/wizard/wizardTabAbstractFilter.js
@@ -294,6 +294,11 @@ OCA = OCA || {};
                onFeatureReceived: function(view, payload) {
                        if(payload.feature === view.getObjectClassItem().featureName) {
                                view.equipMultiSelect(view.getObjectClassItem().$element, payload.data);
+                               if(    !view.getFilterItem().$element.val()
+                                       && view.parsedFilterMode === view.configModel.FILTER_MODE_ASSISTED
+                               ) {
+                                       view.configModel.requestWizard(view.getFilterItem().keyName)
+                               }
                        } else if (payload.feature === view.getGroupsItem().featureName) {
                                if(view.manyGroupsSupport && payload.data.length > view._groupElementSwitchThreshold) {
                                        // we need to fill the left list box, excluding the values

diff --git a/apps/user_ldap/js/wizard/wizardTabLoginFilter.js b/apps/user_ldap/js/wizard/wizardTabLoginFilter.js
index 5e9f0728b0e8f8c5686d44db88fa52c2a4901fe8..9438fd73346470366e4d56141701fb918cfe7123 100644 (file)
--- a/apps/user_ldap/js/wizard/wizardTabLoginFilter.js
+++ b/apps/user_ldap/js/wizard/wizardTabLoginFilter.js
@@ -185,6 +185,9 @@ OCA = OCA || {};
                 */
                onActivate: function() {
                        this.considerFeatureRequests();
+                       if(!this.managedItems.ldap_login_filter.$element.val()) {
+                               this.configModel.requestWizard('ldap_login_filter');
+                       }
                },
 
                /**