Skip to content
Snippets Groups Projects
Unverified Commit 124bb9bd authored by Peter Rotich's avatar Peter Rotich Committed by GitHub
Browse files

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

users: Fix searching of users
parents eafb34d3 20c99323
No related branches found
No related tags found
No related merge requests found
......@@ -79,8 +79,10 @@ class UsersAjaxAPI extends AjaxController {
'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);
}
......
......@@ -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()
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment