diff options
| author | ben-denham <bend@catalyst.net.nz> | 2014-02-28 15:07:25 +1300 |
|---|---|---|
| committer | Arthur Schiwon <blizzz@owncloud.com> | 2014-04-23 11:21:28 +0200 |
| commit | a314508543724f99c16386b041c8fdd568aaac03 (patch) | |
| tree | 3d50625bdcdd2978a43bc4286bc81975275730e2 /apps/user_ldap/settings.php | |
| parent | 74241140d2de4e70c889261a8e2d6d7efa3ce7f3 (diff) | |
| download | nextcloud-server-a314508543724f99c16386b041c8fdd568aaac03.tar.gz nextcloud-server-a314508543724f99c16386b041c8fdd568aaac03.zip | |
Backport of #8164
Added improved version of patch by @blizzz in https://github.com/owncloud/core/issues/6651#issuecomment-32261257 to stop filter settings from being reset under a race condition.
Moved LdapFilter into a separate js file in user_ldap.
Changed conditions in user_ldap's ldapFilter.js to use ===, fixed indentation.
fix comparison in determineMode, fixes problems with restoring the filter mode (assisted or manually) on page refresh
Give hint when composing filter failed
fixing some JSHint warnings
Diffstat (limited to 'apps/user_ldap/settings.php')
| -rw-r--r-- | apps/user_ldap/settings.php | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/apps/user_ldap/settings.php b/apps/user_ldap/settings.php index d077eafdde9..6b7d8e6f53e 100644 --- a/apps/user_ldap/settings.php +++ b/apps/user_ldap/settings.php @@ -25,6 +25,7 @@ OC_Util::checkAdminUser(); +OCP\Util::addScript('user_ldap', 'ldapFilter'); OCP\Util::addScript('user_ldap', 'settings'); OCP\Util::addScript('core', 'jquery.multiselect'); OCP\Util::addStyle('user_ldap', 'settings'); |