Fixed creation if departments (organizationalUnit)

[gosa.git] / gosa-core / plugins / admin / departments / dep-list.xml

diff --git a/gosa-core/plugins/admin/departments/dep-list.xml b/gosa-core/plugins/admin/departments/dep-list.xml
index 4bf9deffbd7e30df3a1462bf27559160c297eaf1..fb7ef73c6ffe9f41ca185f133aef7f69697b22e6 100644 (file)
--- a/gosa-core/plugins/admin/departments/dep-list.xml
+++ b/gosa-core/plugins/admin/departments/dep-list.xml
@@ -40,12 +40,20 @@
       <objectClass>locality</objectClass>
       <category>department</category>
       <class>locality</class>
+      <image>plugins/departments/images/locality.png</image>
+    </objectType>
+
+    <objectType>
+      <label>Organization</label>
+      <objectClass>department</objectClass>
+      <category>department</category>
+      <class>organization</class>
       <image>plugins/departments/images/organization.png</image>
     </objectType>
 
     <objectType>
       <label>Department</label>
-      <objectClass>department</objectClass>
+      <objectClass>organizationalUnit</objectClass>
       <category>department</category>
       <class>department</class>
       <image>images/lists/folder.png</image>
@@ -53,14 +61,14 @@
   </definition>
 
   <table>
-    <layout>|20px||120px|170px;r|</layout>
+    <layout>|20px||320px|70px;r|</layout>
 
     <column>
       <value>%{filter:objectType(dn,objectClass)}</value>
     </column>
 
     <column>
-      <label>ou</label>
+      <label>Department</label>
       <sortAttribute>ou</sortAttribute>
       <sortType>string</sortType>
       <value>%{filter:depLabel(row,dn,"%s",ou,pid,base)}</value>
@@ -68,10 +76,10 @@
     </column>
 
     <column>
-      <label>description</label>
+      <label>Description</label>
       <sortAttribute>description</sortAttribute>
       <sortType>string</sortType>
-      <value>%{filter:link(row,dn,"%s",description)}</value>
+      <value>%{filter:depLabel(row,dn,"%s",description,pid,base)}</value>
       <export>true</export>
     </column>
 
@@ -90,10 +98,45 @@
      <label>Create</label>
 
      <action>
-      <name>new</name>
+      <name>new_domain</name>
+      <type>entry</type>
+      <label>Domain</label>
+      <image>plugins/departments/images/domain.png</image>
+     </action>
+    
+     <action>
+      <name>new_dcObject</name>
+      <type>entry</type>
+      <label>Domain component</label>
+      <image>plugins/departments/images/dc.png</image>
+     </action>
+
+     <action>
+      <name>new_country</name>
+      <type>entry</type>
+      <label>Country</label>
+      <image>plugins/departments/images/country.png</image>
+     </action>
+
+     <action>
+      <name>new_locality</name>
+      <type>entry</type>
+      <label>Locality</label>
+      <image>plugins/departments/images/locality.png</image>
+     </action>
+
+     <action>
+      <name>new_organization</name>
+      <type>entry</type>
+      <label>Organization</label>
+      <image>plugins/departments/images/organization.png</image>
+     </action>
+
+     <action>
+      <name>new_organizationalUnit</name>
       <type>entry</type>
-      <image>plugins/users/images/list_new_user.png</image>
-      <label>User</label>
+      <label>Department</label>
+      <image>images/lists/folder.png</image>
      </action>
 
     </action>
@@ -103,10 +146,11 @@
     </action>
 
     <action>
-      <name>edit</name>
-      <type>entry</type>
-      <image>images/lists/edit.png</image>
-      <label>Edit</label>
+      <type>exporter</type>
+    </action>
+
+    <action>
+      <type>separator</type>
     </action>
 
     <action>