Updated user/group select dialog

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

diff --git a/gosa-core/plugins/admin/groups/userGroupSelect/class_userGroupSelect.inc b/gosa-core/plugins/admin/groups/userGroupSelect/class_userGroupSelect.inc
index 7fe7a1bdb4900b2ad4da4951b9d5e512be76ce6e..b3fc8d7b159818c5316a1f94f069d29e21e9eac4 100644 (file)
--- a/gosa-core/plugins/admin/groups/userGroupSelect/class_userGroupSelect.inc
+++ b/gosa-core/plugins/admin/groups/userGroupSelect/class_userGroupSelect.inc
@@ -32,13 +32,13 @@ class userGroupSelect extends management
     $this->ui = $ui;
     $this->storagePoints = array(get_ou("userRDN"), get_ou("groupRDN"));
 
-    // Build filter
-    if (session::global_is_set(get_class($this)."_filter")){
-      $filter= session::global_get(get_class($this)."_filter");
-    } else {
+#    // Build filter
+ #   if (session::global_is_set(get_class($this)."_filter")){
+  #    $filter= session::global_get(get_class($this)."_filter");
+   # } else {
       $filter = new filter(get_template_path("selectUserGroup-filter.xml", true, dirname(__FILE__)));
       $filter->setObjectStorage($this->storagePoints);
-    }
+    #}
     $this->setFilter($filter);
 
     // Build headpage

diff --git a/gosa-core/plugins/admin/groups/userGroupSelect/selectUserGroup-filter.xml b/gosa-core/plugins/admin/groups/userGroupSelect/selectUserGroup-filter.xml
index 659bead166ebd1c6bdcf11ac4c284ec3ec73abb7..396b912a968c29a10c15e7ef496073d27ce3c32c 100644 (file)
--- a/gosa-core/plugins/admin/groups/userGroupSelect/selectUserGroup-filter.xml
+++ b/gosa-core/plugins/admin/groups/userGroupSelect/selectUserGroup-filter.xml
@@ -3,13 +3,13 @@
 <filterdef>
   <definition>
     <category>users</category>
-    <template>../plugins/admin/groups/userSelect/selectUserGroup-filter.tpl</template>
+    <template>../plugins/admin/groups/userGroupSelect/selectUserGroup-filter.tpl</template>
     <initial>true</initial>
   </definition>
 
   <search>
     <query>
-      <backend>LDAP</backend>
+      <backend>LDAPBlacklist</backend>
       <filter>(&amp;(|$USER $GROUP ) $NAME)</filter>
       <attribute>dn</attribute>
       <attribute>objectClass</attribute>
@@ -33,7 +33,7 @@
     <set>(|(cn=*$*)(sn=*$*)(givenName=*$*))</set>
     <alphabet>true</alphabet>
     <autocomplete>
-      <backend>LDAP</backend>
+      <backend>LDAPBlacklist</backend>
       <filter>(&amp;(objectClass=gosaAccount)(|(cn=*$NAME*)(sn=*$NAME*)(givenName=*$NAME*)))</filter>
       <attribute>cn</attribute>
       <frequency>0.5</frequency>

diff --git a/gosa-core/plugins/admin/groups/userGroupSelect/selectUserGroup-list.tpl b/gosa-core/plugins/admin/groups/userGroupSelect/selectUserGroup-list.tpl
index 8d47ea43024cf293a8c7d1add7dff121d41a7f70..e15cf19b6f3f5e0e10813ff3359c3fd21baeb278 100644 (file)
--- a/gosa-core/plugins/admin/groups/userGroupSelect/selectUserGroup-list.tpl
+++ b/gosa-core/plugins/admin/groups/userGroupSelect/selectUserGroup-list.tpl
@@ -31,9 +31,9 @@
 
 <p class='separator'>&nbsp;</p>
   <p style="text-align:right">
-  <input type=submit name="SavetargetSelectDialog" value="{msgPool type=okButton}">
+  <input type=submit name="userGroupSelect_save" value="{msgPool type=okButton}">
   &nbsp;
-  <input type=submit name="ClosetargetSelectDialog" value="{msgPool type=cancelButton}">
+  <input type=submit name="userGroupSelect_cancel" value="{msgPool type=cancelButton}">
 </p>
 
 <input type="hidden" name="ignore">

diff --git a/gosa-core/plugins/admin/groups/userGroupSelect/selectUserGroup-list.xml b/gosa-core/plugins/admin/groups/userGroupSelect/selectUserGroup-list.xml
index 24cc211feba5f1e6782b8a95c7238e17ced69025..6d519c4144191cda774be57c58d2562a24500525 100644 (file)
--- a/gosa-core/plugins/admin/groups/userGroupSelect/selectUserGroup-list.xml
+++ b/gosa-core/plugins/admin/groups/userGroupSelect/selectUserGroup-list.xml
@@ -6,7 +6,7 @@
     <departmentRootVisible>false</departmentRootVisible>
     <baseMode>true</baseMode>
     <multiSelect>true</multiSelect>
-    <template>../plugins/admin/groups/userSelect/selectUserGroup-list.tpl</template>
+    <template>../plugins/admin/groups/userGroupSelect/selectUserGroup-list.tpl</template>
     <module>users</module>
     <label>List of users and groups</label>
     <defaultSortColumn>1</defaultSortColumn>