Updated application management

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

diff --git a/gosa-plugins/goto/admin/applications/application-list-release.xml b/gosa-plugins/goto/admin/applications/application-list-release.xml
index f5992f2952f83e28ad5100a52211f183901021ee..b8273000eeb184d7a8a626151793e575481141c6 100644 (file)
--- a/gosa-plugins/goto/admin/applications/application-list-release.xml
+++ b/gosa-plugins/goto/admin/applications/application-list-release.xml
@@ -16,7 +16,7 @@
       <objectClass>gosaApplication</objectClass>
       <category>application</category>
       <class>application</class>
-      <image>plugins/applications/images/applications.png</image>
+      <image>plugins/goto/images/select_application.png</image>
     </objectType>
 
   </definition>
@@ -75,7 +75,7 @@
      <action>
       <name>new</name>
       <type>entry</type>
-      <image>plugins/applications/images/new.png</image>
+      <image>images/lists/new.png</image>
       <label>Application</label>
      </action>
     </action>

diff --git a/gosa-plugins/goto/admin/applications/class_applicationManagement.inc b/gosa-plugins/goto/admin/applications/class_applicationManagement.inc
index d97976194bb7b7a5be2733d537b5aa9d406908b1..7cdd8acbc08cf8da185b959a7ce1bd408df23949 100644 (file)
--- a/gosa-plugins/goto/admin/applications/class_applicationManagement.inc
+++ b/gosa-plugins/goto/admin/applications/class_applicationManagement.inc
@@ -81,16 +81,16 @@ class applicationManagement extends management
 
   function renderList()
   {
-    $filter = $this->getFilter();
-    $headpage = $this->getHeadpage();
-    $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($this->IsReleaseManagementActivated()){    
+      $filter = $this->getFilter();
+      $headpage = $this->getHeadpage();
+      $filter->setComboBoxOptions("RELEASE",$this->getReleaseList());
+
+      if(isset($_POST['RELEASE'])){
+        $this->app_release = get_post('RELEASE');
+      }
+      $headpage->setBase($this->app_release);
     }
-    $this->app_release = $headpage->getBase();    
     $headpage->update();
     $display = $headpage->render();
     return($this->getHeader().$display);