From: hickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Fri, 6 Nov 2009 14:25:21 +0000 (+0000)
Subject: Updated application filter.
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=fab6df4ffd63f03e853d702f28621716f39f2b5c;p=gosa.git

Updated application filter.


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

diff --git a/gosa-plugins/goto/admin/applications/application-filter-release.tpl b/gosa-plugins/goto/admin/applications/application-filter-release.tpl
index fc24ad639..c46f8c5bc 100644
--- a/gosa-plugins/goto/admin/applications/application-filter-release.tpl
+++ b/gosa-plugins/goto/admin/applications/application-filter-release.tpl
@@ -8,7 +8,7 @@
 
 <div style="border-top:1px solid #AAAAAA"></div>
 
- {$SCOPE}
+ <LABEL for='RELEASE'>{t}Release{/t}</LABEL>&nbsp;{$RELEASE}<br>
 
  <table summary="" style="width:100%;border-top:1px solid #B0B0B0;">
   <tr>
@@ -18,7 +18,6 @@
     </label>
    </td>
    <td>
-    {$RELEASE}
     {$NAME}
    </td>
   </tr>
diff --git a/gosa-plugins/goto/admin/applications/application-list-release.tpl b/gosa-plugins/goto/admin/applications/application-list-release.tpl
index b233c5874..15488fccd 100644
--- a/gosa-plugins/goto/admin/applications/application-list-release.tpl
+++ b/gosa-plugins/goto/admin/applications/application-list-release.tpl
@@ -10,7 +10,8 @@
       <div class="contentboxb">
        <div style='background:white;padding:0px;padding:3px;'>
         <table><tr>
-          <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>
+          <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-release.xml b/gosa-plugins/goto/admin/applications/application-list-release.xml
index bf3a22f34..f5992f295 100644
--- a/gosa-plugins/goto/admin/applications/application-list-release.xml
+++ b/gosa-plugins/goto/admin/applications/application-list-release.xml
@@ -12,8 +12,8 @@
     <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>
@@ -76,7 +76,7 @@
       <name>new</name>
       <type>entry</type>
       <image>plugins/applications/images/new.png</image>
-      <label>Group</label>
+      <label>Application</label>
      </action>
     </action>
 
@@ -98,14 +98,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 03c17d4fa..d97976194 100644
--- a/gosa-plugins/goto/admin/applications/class_applicationManagement.inc
+++ b/gosa-plugins/goto/admin/applications/class_applicationManagement.inc
@@ -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.
@@ -81,7 +90,7 @@ class applicationManagement extends management
     }else{
       $headpage->setBase($base = get_ou('applicationRDN').$this->config->current['BASE']);
     }
-    
+    $this->app_release = $headpage->getBase();    
     $headpage->update();
     $display = $headpage->render();
     return($this->getHeader().$display);