From: hickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Wed, 17 Mar 2010 14:34:20 +0000 (+0000)
Subject: Updated object removal
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=5c05fdec4ef5554949e5264655d14c21823c5267;p=gosa.git

Updated object removal


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

diff --git a/gosa-core/include/class_management.inc b/gosa-core/include/class_management.inc
index 179d327c0..549d7d170 100644
--- a/gosa-core/include/class_management.inc
+++ b/gosa-core/include/class_management.inc
@@ -308,14 +308,27 @@ class management
 
       // Add locks
       $dns_names = array();
+      $types = array();
+      $h = $this->getHeadpage();
+
+      // Build list of object -labels
+      foreach($h->objectTypes as $type){
+        $map[$type['objectClass']]= $type['label'];
+      }
+
       foreach($this->dns as $dn){
-        $dns_names[] =LDAP::fix($dn);
+        $tmp = $h->getType($dn);
+        if(isset($map[$tmp])){
+          $dns_names[] = '<i>('.$map[$tmp].')</i>&nbsp;'.LDAP::fix($dn);
+        }else{
+          $dns_names[] =LDAP::fix($dn);
+        }
       }
       add_lock ($this->dns, $this->ui->dn);
 
       // Display confirmation dialog.
       $smarty = get_smarty();
-      $smarty->assign("info", msgPool::deleteInfo($dns_names,_($this->objectName)));
+      $smarty->assign("info", msgPool::deleteInfo($dns_names));
       $smarty->assign("multiple", true);
       return($smarty->fetch(get_template_path('removeEntries.tpl')));
     }