Merge pull request #4741 from greezybacon/issue/user-ldap-search

users: Fix searching of users
osTicket · Feb 17, 2019 · 124bb9b · 124bb9b
2 parents eafb34d + 20c9932
commit 124bb9b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/include/ajax.users.php b/include/ajax.users.php
@@ -79,8 +79,10 @@ function search($type = null, $fulltext=false) {
                     'org__name__contains' => $q,
                     'account__username__contains' => $q,
                 ));
-                if (UserForm::getInstance()->getField('phone'))
+                if (UserForm::getInstance()->getField('phone')) {
+                    UserForm::ensureDynamicDataView();
                     $filter->add(array('cdata__phone__contains' => $q));
+                }
 
                 $users->filter($filter);
             }

diff --git a/scp/js/scp.js b/scp/js/scp.js
@@ -483,7 +483,7 @@ var scp_prep = function() {
 
   $('div.tab_content[id] div.error:not(:empty)').each(function() {
     var div = $(this).closest('.tab_content');
-    $('a[href^=#'+div.attr('id')+']').parent().addClass('error');
+    $('a[href^="#'+div.attr('id')+'"]').parent().addClass('error');
   });
 
   $('[data-toggle="tooltip"]').tooltip()