Updated table summary

[gosa.git] / gosa-plugins / goto / admin / applications / class_applicationManagement.inc

diff --git a/gosa-plugins/goto/admin/applications/class_applicationManagement.inc b/gosa-plugins/goto/admin/applications/class_applicationManagement.inc
index 03c17d4fa30ebfede165e0e47d3de197dde7d705..43ec0c5bbd1921be09c5bf4030b47bd07970fc18 100644 (file)
--- a/gosa-plugins/goto/admin/applications/class_applicationManagement.inc
+++ b/gosa-plugins/goto/admin/applications/class_applicationManagement.inc
@@ -23,7 +23,7 @@
 class applicationManagement extends management
 {
   var $plHeadline     = "Applications";
-  var $plDescription  = "Application administration";
+  var $plDescription  = "Application management";
   var $plIcon  = "plugins/goto/images/application.png";
 
   var $app_release = ""; // The currently selected release while in release management mode!
@@ -39,20 +39,29 @@ class applicationManagement extends management
   {
     $this->config = $config;
     $this->ui = $ui;
-   
-    $this->storagePoints = array(get_ou("applicationRDN"));
- 
-#   // Build filter
-#   if (session::global_is_set(get_class($this)."_filter")){
-#     $filter= session::global_get(get_class($this)."_filter");
-#   } else {
-     $filter = new filter(get_template_path("application-filter-release.xml", true));
-#     $filter->setObjectStorage($this->storagePoints);
-#   }
+
+    if($this->IsReleaseManagementActivated()){
+      $this->app_release = get_ou('applicationRDN').$this->config->current['BASE'];
+      $filter_xml = "application-filter-release.xml";
+      $list_xml = "application-list-release.xml";
+      $this->storagePoints= array("");
+    }else{
+      $filter_xml = "application-filter.xml";
+      $list_xml = "application-list.xml";
+      $this->storagePoints= array(get_ou("applicationRDN"));
+    }
+
+    // Build filter
+    if (session::global_is_set(get_class($this)."_filter")){
+      $filter= session::global_get(get_class($this)."_filter");
+    } else {
+      $filter = new filter(get_template_path($filter_xml, true));
+      $filter->setObjectStorage($this->storagePoints);
+    }
     $this->setFilter($filter);
 
     // Build headpage
-    $headpage = new listing(get_template_path("application-list-release.xml", true));
+    $headpage = new listing(get_template_path($list_xml, true));
     $headpage->setFilter($filter);
 
     // Add copy&paste and snapshot handler.
@@ -74,18 +83,18 @@ class applicationManagement extends management
   {
     $filter = $this->getFilter();
     $headpage = $this->getHeadpage();
-    $filter->setComboBoxOptions("RELEASE",$this->getReleaseList());
+    if($this->IsReleaseManagementActivated()){    
+      $filter->setComboBoxOptions("RELEASE",$this->getReleaseList());
 
-    if(isset($_POST['RELEASE'])){
-      $headpage->setBase($_POST['RELEASE']);
-    }else{
-      $headpage->setBase($base = get_ou('applicationRDN').$this->config->current['BASE']);
+      if(isset($_POST['RELEASE'])){
+        $this->app_release = get_post('RELEASE');
+      }
+      $headpage->setBase($this->app_release);
     }
-    
+
     $headpage->update();
     $display = $headpage->render();
     return($this->getHeader().$display);
-
   }
 
   function getReleaseList($base = "", $prefix ="")