From: hickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Tue, 27 Jul 2010 09:59:41 +0000 (+0000)
Subject: Fixed service handling.
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=7954277b6488657388569ab09a48011ba8a2e12d;p=gosa.git

Fixed service handling.
-If all services were used, the list rendering was broken.


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

diff --git a/gosa-plugins/systems/admin/systems/class_serverService.inc b/gosa-plugins/systems/admin/systems/class_serverService.inc
index 1256d1be8..0564f7b84 100644
--- a/gosa-plugins/systems/admin/systems/class_serverService.inc
+++ b/gosa-plugins/systems/admin/systems/class_serverService.inc
@@ -118,6 +118,19 @@ class ServerService extends management
             $desc = $services[$name];
             $serviceList.= sprintf($template, $name,_($desc));
         }
+
+        if(!empty($serviceList)){
+            $serviceList = "
+              <action>
+                 <type>sub</type>
+                 <image>images/lists/element.png[new]</image>
+                 <label>Create</label>
+                 {$serviceList} 
+                </action>
+            ";
+
+         }
+
         $contents = preg_replace("/%SERVICES%/",$serviceList, $contents);
         $headpage = new listing($contents,TRUE);
         $headpage->registerElementFilter("filterServiceStatus", "ServerService::filterServiceStatus");
diff --git a/gosa-plugins/systems/admin/systems/serverService-list.xml b/gosa-plugins/systems/admin/systems/serverService-list.xml
index ddd3132cb..8ee8fd581 100644
--- a/gosa-plugins/systems/admin/systems/serverService-list.xml
+++ b/gosa-plugins/systems/admin/systems/serverService-list.xml
@@ -47,18 +47,7 @@
 
   <actionmenu>
 
-    <action>
-     <type>sub</type>
-     <image>images/lists/element.png[new]</image>
-     <label>Create</label>
-
-     %SERVICES%
-
-    </action>
-
-    <action>
-      <type>separator</type>
-    </action>
+    %SERVICES%
 
     <action>
       <name>remove</name>