From: hickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Wed, 28 Oct 2009 16:23:13 +0000 (+0000)
Subject: Enabled department removal
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=320eea2f3cb2926321e12cdb55fde7702b429e4e;p=gosa.git

Enabled department removal


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

diff --git a/gosa-core/plugins/admin/departments/class_departmentManagement.inc b/gosa-core/plugins/admin/departments/class_departmentManagement.inc
index 51a026e21..d419dd99d 100644
--- a/gosa-core/plugins/admin/departments/class_departmentManagement.inc
+++ b/gosa-core/plugins/admin/departments/class_departmentManagement.inc
@@ -170,31 +170,6 @@ class departmentManagement extends management
     $types['organizationalUnit']['IMG_FULL']= "images/lists/folder-full.png";//:wplugins/departments/images/department.png";
     $types['organizationalUnit']['TITLE']   = _("Department");
     $types['organizationalUnit']['TPL']     = "generic.tpl";
-
-#  /* Alias
-#   */
-#  $types['alias']['ACL']     = "alias";
-#  $types['alias']['CLASS']   = "alias";
-#  $types['alias']['TAB']     = "ALIASTABS";
-#  $types['alias']['ATTR']    = "???";
-#  $types['alias']['OC']      = "???";
-#  $types['alias']['IMG']     = "plugins/departments/images/department_alias.png";
-#  $types['alias']['IMG_FULL']= "plugins/departments/images/department_alias.png";
-#  $types['alias']['TITLE']   = _("Alias");
-#  $types['alias']['TPL']     = "alias.tpl";
-#
-#  /* Referal
-#   */
-#  $types['referal']['ACL']     = "referal";
-#  $types['referal']['CLASS']   = "referal";
-#  $types['referal']['TAB']     = "REFERALTABS";
-#  $types['referal']['ATTR']    = "???";
-#  $types['referal']['OC']      = "???";
-#  $types['referal']['IMG']     = "plugins/departments/images/department_referal.png";
-#  $types['referal']['IMG_FULL']= "plugins/departments/images/department_referal.png";
-#  $types['referal']['TITLE']   = _("Referal");
-#  $types['referal']['TPL']     = "referal.tpl";
-
     return($types);
   }
 } 
diff --git a/gosa-core/plugins/admin/departments/dep-list.xml b/gosa-core/plugins/admin/departments/dep-list.xml
index 7a0b568e2..4bf9deffb 100644
--- a/gosa-core/plugins/admin/departments/dep-list.xml
+++ b/gosa-core/plugins/admin/departments/dep-list.xml
@@ -129,7 +129,7 @@
     </action>
 
     <action>
-      <name>remove_organizationalUnit</name>
+      <name>remove</name>
       <type>entry</type>
       <nospan></nospan>
       <image>images/lists/trash.png</image>
diff --git a/gosa-core/plugins/admin/departments/remove.tpl b/gosa-core/plugins/admin/departments/remove.tpl
index ce2f63071..7fd2cf187 100644
--- a/gosa-core/plugins/admin/departments/remove.tpl
+++ b/gosa-core/plugins/admin/departments/remove.tpl
@@ -11,14 +11,8 @@
 </p>
 
 <p class="plugbottom">
-	{if $multiple}
-		<input type=submit name="delete_multiple_department_confirm" value="{msgPool type=delButton}">
-		&nbsp;
-		<input type=submit name="delete_multiple_department_cancel" value="{msgPool type=cancelButton}">
-		{else}
-		<input type=submit name="delete_department_confirm" value="{msgPool type=delButton}">
-		&nbsp;
-		<input type=submit name="delete_cancel" value="{msgPool type=cancelButton}">
-	{/if}
+	<input type=submit name="delete_confirmed" value="{msgPool type=delButton}">
+	&nbsp;
+	<input type=submit name="delete_cancel" value="{msgPool type=cancelButton}">
 </p>