Updated userSelect dialog

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

diff --git a/gosa-core/plugins/admin/groups/userSelect/user-filter.tpl b/gosa-core/plugins/admin/groups/userSelect/user-filter.tpl
index c115cd06c5ac2f5aa31139f36232f90a2aa2e297..ba7af5cdef3357da37d194fd90ccfb3a1e676e82 100644 (file)
--- a/gosa-core/plugins/admin/groups/userSelect/user-filter.tpl
+++ b/gosa-core/plugins/admin/groups/userSelect/user-filter.tpl
@@ -8,10 +8,6 @@
 
 <div style="border-top:1px solid #AAAAAA"></div>
 
- {$PRIMARY}&nbsp;<LABEL for='TEMPLATES'>{t}Show primary groups{/t}</LABEL><br>
- {$SAMBA}&nbsp;<LABEL for='TEMPLATES'>{t}Show samba groups{/t}</LABEL><br>
- {$MAIL}&nbsp;<LABEL for='TEMPLATES'>{t}Show mail groups{/t}</LABEL><br>
-
  {$SCOPE}
 
  <table summary="" style="width:100%;border-top:1px solid #B0B0B0;">

diff --git a/gosa-core/plugins/admin/groups/userSelect/user-filter.xml b/gosa-core/plugins/admin/groups/userSelect/user-filter.xml
index 5fbe4393bc6541ea9702a2c14614a21b652c5855..a9bc8f7a0d09bdd5c19789a89094a7cf5c93b5b2 100644 (file)
--- a/gosa-core/plugins/admin/groups/userSelect/user-filter.xml
+++ b/gosa-core/plugins/admin/groups/userSelect/user-filter.xml
@@ -29,11 +29,11 @@
     <maxlength>60</maxlength>
     <default></default>
     <unset></unset>
-    <set>(|(sn=*$*)(givenName=*$*))</set>
+    <set>(|(sn=*$*)(givenName=*$*)(cn=*$*))</set>
     <alphabet>true</alphabet>
     <autocomplete>
       <backend>LDAPBlacklist</backend>
-      <filter>(&amp;(objectClass=gosaAccount)(|(sn=*$NAME*)(givenName=*$NAME*)))</filter>
+      <filter>(&amp;(objectClass=gosaAccount)(|(sn=*$NAME*)(givenName=*$NAME*)(cn=*$NAME*)))</filter>
       <attribute>cn</attribute>
       <frequency>0.5</frequency>
       <characters>3</characters>

diff --git a/gosa-core/plugins/admin/groups/userSelect/user-list.xml b/gosa-core/plugins/admin/groups/userSelect/user-list.xml
index 289041f170af9f03a464b1ac2256fb8f7477aa2d..93516b16c92c920b819f7a9daede32a54aa2769e 100644 (file)
--- a/gosa-core/plugins/admin/groups/userSelect/user-list.xml
+++ b/gosa-core/plugins/admin/groups/userSelect/user-list.xml
@@ -15,7 +15,7 @@
       <objectClass>gosaAccount</objectClass>
       <category>users</category>
       <class>user</class>
-      <image>plugins/users/images/user.png</image>
+      <image>plugins/users/images/select_user.png</image>
     </objectType>
 
   </definition>