From cb04e568309426e89e18100968389353c52fef98 Mon Sep 17 00:00:00 2001
From: hickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Mon, 9 Nov 2009 07:45:05 +0000
Subject: [PATCH] Updated Application mangement. -Fixed non release application
 handling.

git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@14793 594d385d-05f5-0310-b6e9-bd551577e9d8
---
 .../admin/applications/application-filter.tpl  |  1 +
 .../admin/applications/application-list.tpl    |  2 +-
 .../admin/applications/application-list.xml    | 18 +++++-------------
 .../class_applicationManagement.inc            |  4 ++--
 4 files changed, 9 insertions(+), 16 deletions(-)

diff --git a/gosa-plugins/goto/admin/applications/application-filter.tpl b/gosa-plugins/goto/admin/applications/application-filter.tpl
index 8f83a74b4..d8c1b1235 100644
--- a/gosa-plugins/goto/admin/applications/application-filter.tpl
+++ b/gosa-plugins/goto/admin/applications/application-filter.tpl
@@ -7,6 +7,7 @@
 <div class="contentboxb">
 
 <div style="border-top:1px solid #AAAAAA"></div>
+ {$SCOPE}
 
  <table summary="" style="width:100%;border-top:1px solid #B0B0B0;">
   <tr>
diff --git a/gosa-plugins/goto/admin/applications/application-list.tpl b/gosa-plugins/goto/admin/applications/application-list.tpl
index 86453651a..b233c5874 100644
--- a/gosa-plugins/goto/admin/applications/application-list.tpl
+++ b/gosa-plugins/goto/admin/applications/application-list.tpl
@@ -10,7 +10,7 @@
       <div class="contentboxb">
        <div style='background:white;padding:0px;padding:3px;'>
         <table><tr>
-          <td>{$RELOAD}&nbsp;</td><td>{$SEPARATOR}&nbsp;</td><td><img src='images/rocket.png' alt='' class='center'></td><td> {$ACTIONS}</td>
+          <td>{$ROOT}&nbsp;</td><td>{$BACK}&nbsp;</td><td>{$HOME}&nbsp;</td><td>{$RELOAD}&nbsp;</td><td>{$SEPARATOR}&nbsp;</td><td>{t}Base{/t} {$BASE}&nbsp;<input class='center' type='image' src='images/lists/submit.png' align='middle' title='{t}Update{/t}' name='submit_department' alt='{t}Submit{/t}'>&nbsp;</td><td>{$SEPARATOR}&nbsp;</td><td><img src='images/rocket.png' alt='' class='center'></td><td> {$ACTIONS}</td>
         </tr></table>
        </div>
       </div>
diff --git a/gosa-plugins/goto/admin/applications/application-list.xml b/gosa-plugins/goto/admin/applications/application-list.xml
index ae5759311..19cb05724 100644
--- a/gosa-plugins/goto/admin/applications/application-list.xml
+++ b/gosa-plugins/goto/admin/applications/application-list.xml
@@ -12,11 +12,11 @@
     <defaultSortColumn>1</defaultSortColumn>
 
     <objectType>
-      <label>Group</label>
-      <objectClass>posixGroup</objectClass>
+      <label>Application</label>
+      <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>
@@ -70,8 +70,8 @@
      <action>
       <name>new</name>
       <type>entry</type>
-      <image>plugins/applications/images/new.png</image>
-      <label>Group</label>
+      <image>images/lists/new.png</image>
+      <label>Application</label>
      </action>
     </action>
 
@@ -93,14 +93,6 @@
       <label>Remove</label>
     </action>
 
-    <action>
-      <name>sendMessage</name>
-      <type>entry</type>
-      <depends>DaemonEvent_notify</depends>
-      <image>plugins/goto/images/notify.png</image>
-      <label>Send message</label>
-    </action>
-
     <action>
       <type>exporter</type>
     </action>
diff --git a/gosa-plugins/goto/admin/applications/class_applicationManagement.inc b/gosa-plugins/goto/admin/applications/class_applicationManagement.inc
index 190a1b04e..50422805d 100644
--- a/gosa-plugins/goto/admin/applications/class_applicationManagement.inc
+++ b/gosa-plugins/goto/admin/applications/class_applicationManagement.inc
@@ -81,9 +81,9 @@ class applicationManagement extends management
 
   function renderList()
   {
+    $filter = $this->getFilter();
+    $headpage = $this->getHeadpage();
     if($this->IsReleaseManagementActivated()){    
-      $filter = $this->getFilter();
-      $headpage = $this->getHeadpage();
       $filter->setComboBoxOptions("RELEASE",$this->getReleaseList());
 
       if(isset($_POST['RELEASE'])){
-- 
2.30.2