From 374a0851c141619e1a745f73580c411cd702ee9a Mon Sep 17 00:00:00 2001 From: cajus Date: Fri, 7 Aug 2009 10:03:22 +0000 Subject: [PATCH] * Added test stub for filters in class_userManagement.inc * Added not automatically loaded scriptacolous files * Modified dummy autocompleter to return some test values git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@14000 594d385d-05f5-0310-b6e9-bd551577e9d8 --- gosa-core/html/autocomplete.php | 8 ++++---- gosa-core/ihtml/themes/default/headers.tpl | 2 ++ .../admin/users/class_userManagement.inc | 17 ++++++++++++++++- 3 files changed, 22 insertions(+), 5 deletions(-) diff --git a/gosa-core/html/autocomplete.php b/gosa-core/html/autocomplete.php index b88b89bee..4aaca3bed 100644 --- a/gosa-core/html/autocomplete.php +++ b/gosa-core/html/autocomplete.php @@ -37,15 +37,15 @@ if (!session::global_is_set('ui')){ if(isset($_POST['NAME'])){ /* Get configuration from session */ - $config= $_SESSION['ui']; + $config= $_SESSION['config']; $ldap= $config->get_ldap_link(); $ldap->cd($config->current['BASE']); $n= normalizeLDAP($_POST['NAME']); - $res= $ldap->search ("(&(objectClass=gosaAccount)(cn=*$n*)(givenName=*$n*)(sn=*$n*)(uid=*$n*))", array("cn")); + $ldap->search ("(&(objectClass=gosaAccount)(|(cn=*$n*)(givenName=*$n*)(sn=*$n*)(uid=*$n*)))", array("cn")); echo ''; } diff --git a/gosa-core/ihtml/themes/default/headers.tpl b/gosa-core/ihtml/themes/default/headers.tpl index 72f05c1a0..520ecd0c4 100644 --- a/gosa-core/ihtml/themes/default/headers.tpl +++ b/gosa-core/ihtml/themes/default/headers.tpl @@ -31,5 +31,7 @@ + + diff --git a/gosa-core/plugins/admin/users/class_userManagement.inc b/gosa-core/plugins/admin/users/class_userManagement.inc index 5278c6480..1d1a6e98c 100644 --- a/gosa-core/plugins/admin/users/class_userManagement.inc +++ b/gosa-core/plugins/admin/users/class_userManagement.inc @@ -968,7 +968,6 @@ class userManagement extends plugin } /* Return rendered main page */ - /* Display dialog with system list */ $this->DivListUsers->parent = $this; $this->DivListUsers->execute(); @@ -978,6 +977,22 @@ class userManagement extends plugin } $this->reload(); $this->DivListUsers->setEntries($this->list); + + # FILTER Test ################################################# + #$filter = new filter(CONFIG_DIR."/filters/user-filter.xml"); + #$filter->setObjectStorage(get_people_ou()); + #$filter->setCategory("users"); + #$filter->setCurrentBase($this->DivListUsers->selectedBase); + #$filter->update(); + #if (!$filter->isValid()){ + # msg_dialog::display(_("Filter error"), _("The filter is uncomplete!"), ERROR_DIALOG); + #} else { + # print "Filter results:"; + # print_a($filter->query()); + #} + #return($filter->renderFilter().$this->DivListUsers->Draw()); + ################################################### FILTER Test + return($this->DivListUsers->Draw()); } -- 2.30.2