summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 2b54634)
raw | patch | inline | side by side (parent: 2b54634)
author | cajus <cajus@594d385d-05f5-0310-b6e9-bd551577e9d8> | |
Thu, 5 Nov 2009 11:21:36 +0000 (11:21 +0000) | ||
committer | cajus <cajus@594d385d-05f5-0310-b6e9-bd551577e9d8> | |
Thu, 5 Nov 2009 11:21:36 +0000 (11:21 +0000) |
git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@14756 594d385d-05f5-0310-b6e9-bd551577e9d8
diff --git a/gosa-core/plugins/admin/groups/class_groupManagement.inc b/gosa-core/plugins/admin/groups/class_groupManagement.inc
index 0c3107aa2b27c75401aa25b84cedbdecf46c8b24..8a86eb0cdb7d480b98db847fe34152ee81a4d84c 100644 (file)
"title" => _("Edit phone properties")
),
+ "gotoMenuGroup" =>
+ array(
+ "image" => "plugins/groups/images/menu.png",
+ "plugin" => "groupApplication",
+ "alt" => _("Menu"),
+ "title" => _("Edit start menu properties")
+ ),
+
"gotoEnvironment" =>
array(
"image" => "plugins/groups/images/environment.png",
diff --git a/gosa-core/plugins/admin/groups/group-filter.tpl b/gosa-core/plugins/admin/groups/group-filter.tpl
index c7ecdbd65256e99bc5e7e022140c5b4ffd25a43a..c115cd06c5ac2f5aa31139f36232f90a2aa2e297 100644 (file)
<div style="border-top:1px solid #AAAAAA"></div>
- <div style="border-top:1px solid #AAAAAA"></div>
-
{$PRIMARY} <LABEL for='TEMPLATES'>{t}Show primary groups{/t}</LABEL><br>
{$SAMBA} <LABEL for='TEMPLATES'>{t}Show samba groups{/t}</LABEL><br>
{$MAIL} <LABEL for='TEMPLATES'>{t}Show mail groups{/t}</LABEL><br>
diff --git a/gosa-core/plugins/admin/groups/group-filter.xml b/gosa-core/plugins/admin/groups/group-filter.xml
index 98e296fc41f3e211d1429cdaa98df34918d05f8f..0b49bfa32eed529448cd5df956ef2a504395e7ab 100644 (file)
<search>
<query>
- <backend>LDAP</backend>
+ <backend>GroupLDAP</backend>
<filter>(&(objectClass=posixGroup)$NAME(|$PRIMARY$MAIL$SAMBA))</filter>
<attribute>dn</attribute>
<attribute>objectClass</attribute>
<element>
<type>checkbox</type>
<tag>PRIMARY</tag>
- <default></default>
+ <default>true</default>
<unset></unset>
<set>(!(objectClass=gosaObject))</set>
</element>
<maxlength>60</maxlength>
<default></default>
<unset></unset>
- <set>(|(cn=*$*)(sn=*$*)(givenName=*$*))</set>
+ <set>(|(cn=*$*)(description=*$*))</set>
<alphabet>true</alphabet>
<autocomplete>
<backend>LDAP</backend>
- <filter>(&(objectClass=posixGroup)(|(cn=*$NAME*)))</filter>
+ <filter>(&(objectClass=posixGroup)(|(cn=*$NAME*)(description=*$NAME*)))</filter>
<attribute>cn</attribute>
<frequency>0.5</frequency>
<characters>3</characters>
diff --git a/gosa-core/plugins/admin/groups/group-list.xml b/gosa-core/plugins/admin/groups/group-list.xml
index e24d4c2030dad9ade942ba3b442130fad289506e..a50f5130b4cc33a7e04d2d513a053d96c0fb81b5 100644 (file)
</definition>
<table>
- <layout>|16px||250px|100px|170px;r|</layout>
+ <layout>|16px||250px|120px|150px;r|</layout>
<department>
<value>%{filter:objectType(dn,objectClass)}</value>