Updated Class config management

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

diff --git a/gosa-plugins/goto/admin/ConfigManagement/DeviceConfig-list.xml b/gosa-plugins/goto/admin/ConfigManagement/DeviceConfig-list.xml
index 9a6812df063514569b2ebb6e2343da36579a5907..99bc644f86ee34df72a492b9465ce50e357cbc38 100644 (file)
--- a/gosa-plugins/goto/admin/ConfigManagement/DeviceConfig-list.xml
+++ b/gosa-plugins/goto/admin/ConfigManagement/DeviceConfig-list.xml
@@ -6,7 +6,7 @@
     <departmentRootVisible>false</departmentRootVisible>
     <baseMode>false</baseMode>
     <multiSelect>true</multiSelect>
-    <template>goto/Config/DeviceConfig-list.tpl</template>
+    <template>DeviceConfig-list.tpl</template>
     <label>List of items</label>
     <defaultSortColumn>1</defaultSortColumn>
 

diff --git a/gosa-plugins/goto/admin/ConfigManagement/class_ConfigManagement.inc b/gosa-plugins/goto/admin/ConfigManagement/class_ConfigManagement.inc
index aecc3d3d8e212da7fd3a7a4189b1c696cbca0006..d11bf2fc913bf1bbe1f406501c77c7ee2b54ee90 100644 (file)
--- a/gosa-plugins/goto/admin/ConfigManagement/class_ConfigManagement.inc
+++ b/gosa-plugins/goto/admin/ConfigManagement/class_ConfigManagement.inc
@@ -43,7 +43,6 @@ class ConfigManagement extends management
     // Some plugin related memebers which are not member of 
     //  the management class. See class plugin.
     public $initTime;
-    public $is_account = FALSE;
     public $ignore_account = FALSE;
     public $pl_notify;
     public $read_only;
@@ -78,7 +77,6 @@ class ConfigManagement extends management
      */
     function setInstallMethod($str)
     {
-        $this->is_account = FALSE;
         if(!isset($this->allItemConfigurations[$str])){
             $this->itemConfig = array();
             $this->invalidInstallMethod =TRUE;
@@ -112,7 +110,6 @@ class ConfigManagement extends management
             $this->rootItemID = $idRoot;
             $this->setCurrentItem($idRoot);
             $this->setSelectedListItemID($idRoot);
-            $this->is_account = TRUE;
             $this->rebuildListing();
             return(TRUE);
         }
@@ -316,14 +313,7 @@ class ConfigManagement extends management
             $smarty->assign('rpcError', $this->rpcError);
             $smarty->assign('invalidInstallMethod', $this->invalidInstallMethod);
             $smarty->assign('error', $this->errorMessage);
-            return($smarty->fetch(get_template_path('goto/Config/failed.tpl', TRUE)));
-        }
-
-        // Do we represent a valid account
-        if (!$this->is_account){
-            $str = "<img alt=\"\" src=\"images/small-error.png\" align=\"middle\">&nbsp;<b>".
-                msgPool::noValidExtension("GOsa")."</b>";
-            return($str);
+            return($smarty->fetch(get_template_path('failed.tpl', TRUE)));
         }
 
         // Collect item container list to be able to render the fake-base selector
@@ -375,13 +365,13 @@ class ConfigManagement extends management
         if (session::global_is_set(get_class($this)."_filter")){
             $filter= session::global_get(get_class($this)."_filter");
         } else {
-            $filter = new filter(get_template_path("goto/Config/DeviceConfig-filter.xml", true));
+            $filter = new filter(get_template_path("DeviceConfig-filter.xml", true));
             $filter->setObjectStorage($this->storagePoints);
         }
         $this->setFilter($filter);
 
         // Load service xml file and fill in placeholders
-        $contents =file_get_contents(get_template_path("goto/Config/DeviceConfig-list.xml", true));
+        $contents =file_get_contents(get_template_path("DeviceConfig-list.xml", true));
 
         // Build up device-list configuration   
         $types ="";