From: hickert Date: Tue, 26 Jan 2010 10:35:30 +0000 (+0000) Subject: Updated trust dialog X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=8ccb9b1249f70f0ea42aa9fa1e4977354945b2e4;p=gosa.git Updated trust dialog git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@15311 594d385d-05f5-0310-b6e9-bd551577e9d8 --- diff --git a/gosa-core/plugins/personal/posix/trustSelect/class_trustSelect.inc b/gosa-core/plugins/personal/posix/trustSelect/class_trustSelect.inc index df39484c2..2bcb14806 100644 --- a/gosa-core/plugins/personal/posix/trustSelect/class_trustSelect.inc +++ b/gosa-core/plugins/personal/posix/trustSelect/class_trustSelect.inc @@ -31,7 +31,7 @@ class trustSelect extends management $this->config = $config; $this->ui = $ui; - $this->storagePoints = array(get_ou("groupRDN")); + $this->storagePoints = array(get_ou("workstationRDN"),get_ou("terminalRDN"),get_ou("serverRDN"),); # // Build filter # if (session::global_is_set(get_class($this)."_filter")){ diff --git a/gosa-core/plugins/personal/posix/trustSelect/trust-filter.tpl b/gosa-core/plugins/personal/posix/trustSelect/trust-filter.tpl index c115cd06c..0d911338a 100644 --- a/gosa-core/plugins/personal/posix/trustSelect/trust-filter.tpl +++ b/gosa-core/plugins/personal/posix/trustSelect/trust-filter.tpl @@ -8,11 +8,13 @@
- {$PRIMARY} 
- {$SAMBA} 
- {$MAIL} 
+ {$SERVER} {t}Show servers{/t}
+ {$WORKSTATION} {t}Show workstations{/t}
+ {$TERMINAL} {t}Show terminals{/t}
- {$SCOPE} +
+ + {$SCOPE} diff --git a/gosa-core/plugins/personal/posix/trustSelect/trust-filter.xml b/gosa-core/plugins/personal/posix/trustSelect/trust-filter.xml index 17abcd750..c0b355564 100644 --- a/gosa-core/plugins/personal/posix/trustSelect/trust-filter.xml +++ b/gosa-core/plugins/personal/posix/trustSelect/trust-filter.xml @@ -7,10 +7,10 @@ true - + LDAP - (&(objectClass=posixGroup)$NAME(|$PRIMARY$MAIL$SAMBA)) + (&(|$SERVER $WORKSTATION $TERMINAL)$NAME) dn objectClass cn @@ -20,45 +20,45 @@ - checkbox - PRIMARY - true + textfield + NAME + 20 + 60 + - (!(objectClass=gosaObject)) + (cn=*$*) + false + + SYSTEMS + (cn=*$NAME*) + cn + 0.5 + 3 + checkbox - MAIL + SERVER true - (objectClass=gosaMailAccount) + (objectClass=goServer) checkbox - SAMBA + WORKSTATION true - (objectClass=sambaGroupMapping) + (objectClass=gotoWorkstation) - textfield - NAME - 20 - 60 - + checkbox + TERMINAL + true - (|(cn=*$*)(description=*$*)) - true - - LDAP - (&(objectClass=posixGroup)(|(cn=*$NAME*)(description=*$NAME*))) - cn - 0.5 - 3 - + (objectClass=gotoTerminal) diff --git a/gosa-core/plugins/personal/posix/trustSelect/trust-list.xml b/gosa-core/plugins/personal/posix/trustSelect/trust-list.xml index c9c3c8d49..8ec5d1959 100644 --- a/gosa-core/plugins/personal/posix/trustSelect/trust-list.xml +++ b/gosa-core/plugins/personal/posix/trustSelect/trust-list.xml @@ -7,16 +7,31 @@ true true - groups - + 1 - - posixGroup - groups - group - plugins/groups/images/groups.png + + goServer + server + servgeneric + plugins/systems/images/select_server.png + + + + + gotoWorkstation + workstation + workgeneric + plugins/systems/images/select_workstation.png + + + + + gotoTerminal + terminal + termgeneric + plugins/systems/images/select_terminal.png