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 df39484c243ef47c53001cb103543b9526cde949..2bcb14806d1981f88c225319529af22926668593 100644 (file)
--- 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 c115cd06c5ac2f5aa31139f36232f90a2aa2e297..0d911338a0bd8c70d43f20fad2198f74c2f03786 100644 (file)
--- a/gosa-core/plugins/personal/posix/trustSelect/trust-filter.tpl
+++ b/gosa-core/plugins/personal/posix/trustSelect/trust-filter.tpl
@@ -8,11 +8,13 @@
 
 <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>
+  {$SERVER}&nbsp;{t}Show servers{/t}<br>
+  {$WORKSTATION}&nbsp;{t}Show workstations{/t}<br>
+  {$TERMINAL}&nbsp;{t}Show terminals{/t}<br>
 
- {$SCOPE}
+  <div style="border-top:1px solid #AAAAAA"></div>
+
+  {$SCOPE}
 
  <table summary="" style="width:100%;border-top:1px solid #B0B0B0;">
   <tr>

diff --git a/gosa-core/plugins/personal/posix/trustSelect/trust-filter.xml b/gosa-core/plugins/personal/posix/trustSelect/trust-filter.xml
index 17abcd750ef944ec415b000a91c6fe5bb3b74a28..c0b3555642fa1073af32f27a96d5217426fbab9c 100644 (file)
--- a/gosa-core/plugins/personal/posix/trustSelect/trust-filter.xml
+++ b/gosa-core/plugins/personal/posix/trustSelect/trust-filter.xml
@@ -7,10 +7,10 @@
     <initial>true</initial>
   </definition>
 
-  <search>
+ <search>
     <query>
       <backend>LDAP</backend>
-      <filter>(&amp;(objectClass=posixGroup)$NAME(|$PRIMARY$MAIL$SAMBA))</filter>
+      <filter>(&amp;(|$SERVER $WORKSTATION $TERMINAL)$NAME)</filter>
       <attribute>dn</attribute>
       <attribute>objectClass</attribute>
       <attribute>cn</attribute>
@@ -20,45 +20,45 @@
   </search>
 
   <element>
-    <type>checkbox</type>
-    <tag>PRIMARY</tag>
-    <default>true</default>
+    <type>textfield</type>
+    <tag>NAME</tag>
+    <size>20</size>
+    <maxlength>60</maxlength>
+    <default></default>
     <unset></unset>
-    <set>(!(objectClass=gosaObject))</set>
+    <set>(cn=*$*)</set>
+    <alphabet>false</alphabet>
+    <autocomplete>
+      <backend>SYSTEMS</backend>
+      <filter>(cn=*$NAME*)</filter>
+      <attribute>cn</attribute>
+      <frequency>0.5</frequency>
+      <characters>3</characters>
+    </autocomplete>
   </element>
 
   <element>
     <type>checkbox</type>
-    <tag>MAIL</tag>
+    <tag>SERVER</tag>
     <default>true</default>
     <unset></unset>
-    <set>(objectClass=gosaMailAccount)</set>
+    <set>(objectClass=goServer)</set>
   </element>
 
   <element>
     <type>checkbox</type>
-    <tag>SAMBA</tag>
+    <tag>WORKSTATION</tag>
     <default>true</default>
     <unset></unset>
-    <set>(objectClass=sambaGroupMapping)</set>
+    <set>(objectClass=gotoWorkstation)</set>
   </element>
 
   <element>
-    <type>textfield</type>
-    <tag>NAME</tag>
-    <size>20</size>
-    <maxlength>60</maxlength>
-    <default></default>
+    <type>checkbox</type>
+    <tag>TERMINAL</tag>
+    <default>true</default>
     <unset></unset>
-    <set>(|(cn=*$*)(description=*$*))</set>
-    <alphabet>true</alphabet>
-    <autocomplete>
-      <backend>LDAP</backend>
-      <filter>(&amp;(objectClass=posixGroup)(|(cn=*$NAME*)(description=*$NAME*)))</filter>
-      <attribute>cn</attribute>
-      <frequency>0.5</frequency>
-      <characters>3</characters>
-    </autocomplete>
+    <set>(objectClass=gotoTerminal)</set>
   </element>
 
 </filterdef>

diff --git a/gosa-core/plugins/personal/posix/trustSelect/trust-list.xml b/gosa-core/plugins/personal/posix/trustSelect/trust-list.xml
index c9c3c8d49f39b93f486c957f8b407bb8dd6b0226..8ec5d1959f2415ca1d5154970f7984d09bbecd0a 100644 (file)
--- a/gosa-core/plugins/personal/posix/trustSelect/trust-list.xml
+++ b/gosa-core/plugins/personal/posix/trustSelect/trust-list.xml
@@ -7,16 +7,31 @@
     <baseMode>true</baseMode>
     <multiSelect>true</multiSelect>
     <template>../plugins/personal/posix/trustSelect/trust-list.tpl</template>
-    <module>groups</module>
-    <label>List of groups</label>
+    <label>List of systems</label>
     <defaultSortColumn>1</defaultSortColumn>
 
     <objectType>
-      <label>Group</label>
-      <objectClass>posixGroup</objectClass>
-      <category>groups</category>
-      <class>group</class>
-      <image>plugins/groups/images/groups.png</image>
+      <label>Server</label>
+      <objectClass>goServer</objectClass>
+      <category>server</category>
+      <class>servgeneric</class>
+      <image>plugins/systems/images/select_server.png</image>
+    </objectType>
+
+    <objectType>
+      <label>Workstation</label>
+      <objectClass>gotoWorkstation</objectClass>
+      <category>workstation</category>
+      <class>workgeneric</class>
+      <image>plugins/systems/images/select_workstation.png</image>
+    </objectType>
+
+    <objectType>
+      <label>Terminal</label>
+      <objectClass>gotoTerminal</objectClass>
+      <category>terminal</category>
+      <class>termgeneric</class>
+      <image>plugins/systems/images/select_terminal.png</image>
     </objectType>
 
   </definition>