Initial filtering

git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@14651 594d385d-05f5-0310-b6e9-bd551577e9d8

diff --git a/gosa-core/plugins/admin/users/class_userManagement.inc b/gosa-core/plugins/admin/users/class_userManagement.inc
index 0fc4d93f01093cb787647e5869e86c028df066f6..d27045db6de1115392671ada830b8673a581bcf1 100644 (file)
--- a/gosa-core/plugins/admin/users/class_userManagement.inc
+++ b/gosa-core/plugins/admin/users/class_userManagement.inc
@@ -47,6 +47,7 @@ class userManagement extends management
     // Build filter
     $filter = new filter(get_template_path("user-filter.xml", true));
     $filter->setObjectStorage("ou=people,");
+    $this->setFilter($filter);
 
     // Build headpage
     $headpage = new listing(get_template_path("user-list.xml", true));

diff --git a/gosa-core/plugins/admin/users/user-filter.tpl b/gosa-core/plugins/admin/users/user-filter.tpl
index 4eecb3e52c7c22a8d5ce874947576fc64dbb19fe..417b7bf2e1a8746fe70068eb5332b0deaed98da6 100644 (file)
--- a/gosa-core/plugins/admin/users/user-filter.tpl
+++ b/gosa-core/plugins/admin/users/user-filter.tpl
@@ -6,6 +6,8 @@
 
 <div class="contentboxb">
  <div style="border-top:1px solid #AAAAAA"></div>
+ {$SCOPE}
+
  <table summary="" style="width:100%;border-top:1px solid #B0B0B0;">
   <tr>
    <td>
@@ -17,6 +19,8 @@
     {$NAME}
    </td>
   </tr>
+ </table>
+
  <table summary=""  width="100%"  style="background:#EEEEEE;border-top:1px solid #B0B0B0;">
   <tr>
    <td width="100%" align="right">

diff --git a/gosa-core/plugins/admin/users/user-filter.xml b/gosa-core/plugins/admin/users/user-filter.xml
index 4bb82390efdf90db1f4d167a94e622cca2c0e616..0fb3fe8d93df736bfff748100425096ae9e6f6e6 100644 (file)
--- a/gosa-core/plugins/admin/users/user-filter.xml
+++ b/gosa-core/plugins/admin/users/user-filter.xml
@@ -18,7 +18,7 @@
       <attribute>uid</attribute>
       <attribute>userPassword</attribute>
     </query>
-    <scope>one</scope>
+    <scope>auto</scope>
   </search>
 
   <element>

diff --git a/gosa-core/plugins/admin/users/user-list.xml b/gosa-core/plugins/admin/users/user-list.xml
index 1500972338f8c8f4ff8ce21aee1e990cc532d6a2..3552af42c0638263d5da841f14bc9bb60be5cc1a 100644 (file)
--- a/gosa-core/plugins/admin/users/user-list.xml
+++ b/gosa-core/plugins/admin/users/user-list.xml
@@ -30,7 +30,7 @@
   </definition>
 
   <table>
-    <layout>|20px||200px|100px|200px;r|</layout>
+    <layout>|20px||200px|150px|180px;r|</layout>
 
     <department>
       <value>%{filter:objectType(dn,objectClass)}</value>