Updated objectListing

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

diff --git a/gosa-core/plugins/admin/newConfigManagement/class_ConfigManagementListing.inc b/gosa-core/plugins/admin/newConfigManagement/class_ConfigManagementListing.inc
index acc0c4f0ecf2eac6cb3028d58bebe896a8ab6f26..97504a2e0045b0699c5ba0fcac414638615eb7bc 100644 (file)
--- a/gosa-core/plugins/admin/newConfigManagement/class_ConfigManagementListing.inc
+++ b/gosa-core/plugins/admin/newConfigManagement/class_ConfigManagementListing.inc
@@ -59,11 +59,11 @@ class ConfigManagementListing extends management
         $this->itemSelector->update(TRUE);
     }
 
+
     function renderList()
     {
         session::set('DEVICE_ITEMS', array());
 
-        $filter = $this->getFilter();
         $headpage = $this->getHeadpage();
         $headpage->update();
         $smarty = get_smarty();
@@ -103,8 +103,6 @@ class ConfigManagementListing extends management
         }
         $this->setFilter($filter);
 
-        
-
         // Load service xml file and fill in placeholders
         $contents = file_get_contents(get_template_path("DeviceConfig-list.xml", true));
         $contents = preg_replace("/%TYPES%/", $this->objectTypeStr, $contents);

diff --git a/gosa-core/plugins/admin/newConfigManagement/class_newConfigManagement.inc b/gosa-core/plugins/admin/newConfigManagement/class_newConfigManagement.inc
index 4d5822c88b70dd83d07cd184bd31f481d6eebbd3..23b877d27c19ba446d20fee2ece7a2a817bacf19 100644 (file)
--- a/gosa-core/plugins/admin/newConfigManagement/class_newConfigManagement.inc
+++ b/gosa-core/plugins/admin/newConfigManagement/class_newConfigManagement.inc
@@ -133,6 +133,7 @@ class newConfigManagement extends plugin
      */
     function execute()
     {
+
         // Get the selected release and store it in a session variable
         //  to allow the configFilter to access it and display the
         //  packages and items.
@@ -141,7 +142,7 @@ class newConfigManagement extends plugin
         session::set('CONFIG_ITEM', $item);
         $this->listing->setListingTypes($this->getListingTypes());
 
-        return($this->listing->renderList());
+        return($this->listing->execute());
     }
 
 
@@ -235,9 +236,15 @@ class newConfigManagement extends plugin
 
         $types['Release']['objectClass'] = 'Release';
         $types['Release']['label'] = _('Release');
-        $types['Release']['image'] = 'images/lists/edit.png';
+        $types['Release']['image'] = 'images/lists/delete.png';
         $types['Release']['category'] = 'Device';
         $types['Release']['class'] = 'Device';
+
+        $types['Component']['objectClass'] = 'Component';
+        $types['Component']['label'] = _('Component');
+        $types['Component']['image'] = 'images/lists/edit.png';
+        $types['Component']['category'] = 'Device';
+        $types['Component']['class'] = 'Device';
         return($types);
     }