From: hickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Thu, 7 Jul 2011 12:04:35 +0000 (+0000)
Subject: Updated the Device template
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=37074b98f77168a6e8761483f6356ec7be9de94c;p=gosa.git

Updated the Device template


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

diff --git a/gosa-plugins/goto/admin/systems/goto/Device/Device.tpl b/gosa-plugins/goto/admin/systems/goto/Device/Device.tpl
index 645ff8fe2..2256d3c7a 100644
--- a/gosa-plugins/goto/admin/systems/goto/Device/Device.tpl
+++ b/gosa-plugins/goto/admin/systems/goto/Device/Device.tpl
@@ -1,5 +1,3 @@
-
-
 <table width="100%">
     <tr>
         <td style='width:50%;'>
@@ -35,43 +33,8 @@
                     </td>
                 </tr>
             </table>
-
-            <hr>
-            <h3>{t}Registration{/t}</h3>
-            <table>
-                <tr>
-                    <td><LABEL for='deviceType'>{t}Type{/t}</LABEL>
-                    </td>
-                    <td>
-                        {render acl=$deviceTypeACL}
-                            <input type="text" name="deviceType" value="{$deviceType}" id="deviceType" value="{$deviceType}">
-                        {/render}
-                    </td>
-                </tr>
-                <tr>
-                    <td><LABEL for='deviceUUID'>{t}Device UUID{/t}</LABEL></td>
-                    <td> 
-                        {render acl=$deviceUUIDACL}
-                            <input type="text" name="deviceUUID" value="{$deviceUUID}" id="deviceUUID" value="{$deviceUUID}">
-                        {/render}
-                        {render acl=$deviceUUIDACL}
-                            {image path="images/lists/reload.png" action="reloadUUID"}
-                        {/render}
-                    </td>
-                </tr>
-                <tr>
-                    <td><LABEL for='deviceStatus'>{t}Status{/t}</LABEL>
-                    </td>
-                    <td>
-                        {render acl=$deviceStatusACL}
-                            <input type="text" name="deviceStatus" value="{$deviceStatus}" id="deviceStatus" value="{$deviceStatus}">
-                        {/render}
-                    </td>
-                </tr>
-            </table>
         </td>
-        <td class='left-border' style='padding-left:5px;' rowspan=2>
-
+        <td class='left-border' style='padding-left:5px;'>
             <h3>{t}Orgaizational data{/t}</h3>
             <table>
                 <tr>
@@ -133,6 +96,51 @@
                  </td>
                 </tr>
 -->
+            </table>
+        </td>
+    </tr>
+    <tr>
+        <td colspan="2">
+            <hr>
+        </td>
+    </tr>
+    <tr>    
+        <td style='width:50%;'>
+            <h3>{t}Registration{/t}</h3>
+            <table>
+                <tr>
+                    <td><LABEL for='deviceUUID'>{t}Device UUID{/t}</LABEL></td>
+                    <td> 
+                        {render acl=$deviceUUIDACL}
+                            <input type="text" name="deviceUUID" value="{$deviceUUID}" id="deviceUUID" value="{$deviceUUID}">
+                        {/render}
+                        {render acl=$deviceUUIDACL}
+                            {image path="images/lists/reload.png" action="reloadUUID"}
+                        {/render}
+                    </td>
+                </tr>
+                <tr>
+                    <td><LABEL for='deviceType'>{t}Type{/t}</LABEL>
+                    </td>
+                    <td>
+                        {render acl=$deviceTypeACL}
+                            <input type="text" name="deviceType" value="{$deviceType}" id="deviceType" value="{$deviceType}">
+                        {/render}
+                    </td>
+                </tr>
+            </table>
+        </td>
+        <td class='left-border' style='padding-left:5px; padding-top:10px;'>
+            <table>
+                <tr>
+                    <td><LABEL for='deviceStatus'>{t}Status{/t}</LABEL>
+                    </td>
+                    <td>
+                        {render acl=$deviceStatusACL}
+                            <input type="text" name="deviceStatus" value="{$deviceStatus}" id="deviceStatus" value="{$deviceStatus}">
+                        {/render}
+                    </td>
+                </tr>
                 <tr>
                     <td><LABEL for='manager'>{t}Manager{/t}</LABEL>
                     </td>
diff --git a/gosa-plugins/goto/admin/systems/goto/Device/class_DeviceConfig.inc b/gosa-plugins/goto/admin/systems/goto/Device/class_DeviceConfig.inc
index 242d8a487..43cb84e4f 100644
--- a/gosa-plugins/goto/admin/systems/goto/Device/class_DeviceConfig.inc
+++ b/gosa-plugins/goto/admin/systems/goto/Device/class_DeviceConfig.inc
@@ -290,7 +290,7 @@ class DeviceConfig extends plugin
         $rpc = $this->config->getRpcHandle();
         $installConfigManagement = $this->parent->by_object['InstallRecipe']->installConfigManagement;
         $rpc->systemSetConfigParameters($this->deviceUUID, array('method' => $installConfigManagement, 
-                    'var' => $save, 'item' => $this->usedElements));
+                    'var' => $save, 'item' => array_values($this->usedElements)));
         if(!$rpc->success()){
             msg_dialog::display(_("Error"), msgPool::rpcError($rpc->get_error()), ERROR_DIALOG);
             return(NULL);