[Nagvis-checkins] SF.net Git: nagvis: Bugfix: Removed backendtype fields from " Manage Backends" dialog forms

[lars]

Author:   Lars Michelsen <l...@larsmichelsen.com>
Date:     Fri Dec 30 00:09:00 2011 +0100
Committer:   Lars Michelsen <l...@larsmichelsen.com>
Commit-Date: Fri Dec 30 00:09:00 2011 +0100

Bugfix: Removed backendtype fields from "Manage Backends" dialog forms

---

 ChangeLog                                          |    1 +
 share/frontend/nagvis-js/js/ManageBackends.js      |   14 +++++++++-----
 share/server/core/classes/CoreModMainCfg.php       |    4 ++--
 .../templates/default.wuiManageBackends.html       |    4 ++--
 4 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 0e4da84..3779827 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,7 @@ Frontend
   * Bugfix: Preventing JS error when trying to position objects relative but
   no target object can be found
   * Bugfix: Fixed file upload input field styling issues (at least in Firefox)
+  * Bugfix: Removed backendtype fields from "Manage Backends" dialog forms
 
 1.6.2
 Core
diff --git a/share/frontend/nagvis-js/js/ManageBackends.js 
b/share/frontend/nagvis-js/js/ManageBackends.js
index b24fcf8..aa98fa7 100644
--- a/share/frontend/nagvis-js/js/ManageBackends.js
+++ b/share/frontend/nagvis-js/js/ManageBackends.js
@@ -71,8 +71,11 @@ function updateBackendOptions(sBackendType, backendId, 
sFormId) {
 
     // Get backend type from configued values when not set via function call
     // This occurs when editing backends cause only backendid is given
-    if(backendType === '')
+    if(backendType === '') {
         backendType = oValues['backendtype'];
+        // Also set the value in the form
+        document.backend_edit.backendtype.value = backendType;
+    }
 
     // Fallback to default backendtype when nothing set here
     if(backendType === '')
@@ -83,9 +86,10 @@ function updateBackendOptions(sBackendType, backendId, 
sFormId) {
     oOptions = validMainConfig['backend']['options'][backendType];
     for(var sKey in validMainConfig['backend']) {
         // Exclude: backendid, backendtype, options
-        if(sKey !== 'backendid' && (sBackendType === '' || (sBackendType !== 
'' && sKey !== 'backendtype')) && sKey !== 'options') {
-            oOptions[sKey] = validMainConfig['backend'][sKey];
-        }
+        if(sKey === 'backendid' || sKey === 'backendtype' || sKey === 
'options')
+            continue;
+
+        oOptions[sKey] = validMainConfig['backend'][sKey];
     }
 
     for(var sKey in oOptions) {
@@ -208,4 +212,4 @@ function check_backend_del() {
     //FIXME: Check if backend is used in any maps/objects
 
     return true;
-}
\ No newline at end of file
+}
diff --git a/share/server/core/classes/CoreModMainCfg.php 
b/share/server/core/classes/CoreModMainCfg.php
index 62b71fe..5ead760 100644
--- a/share/server/core/classes/CoreModMainCfg.php
+++ b/share/server/core/classes/CoreModMainCfg.php
@@ -200,9 +200,9 @@ class CoreModMainCfg extends CoreModule {
 
     protected function handleResponseBackendEdit() {
         $FHANDLER = new CoreRequestHandler($_POST);
-        $this->verifyValuesSet($FHANDLER, Array('backendid', 'backendtype'));
+        $this->verifyValuesSet($FHANDLER, Array('backendid'));
         return Array('backendid'   => $FHANDLER->get('backendid'),
-                     'backendtype' => $FHANDLER->get('backendtype'),
+                     'backendtype' => 
$this->CORE->getUserMainCfg()->getValue('backend_'.$FHANDLER->get('backendid'), 
'backendtype'),
                      'opts'        => $_POST);
     }
 
diff --git a/share/userfiles/templates/default.wuiManageBackends.html 
b/share/userfiles/templates/default.wuiManageBackends.html
index 954d4ca..8f1cbd2 100644
--- a/share/userfiles/templates/default.wuiManageBackends.html
+++ b/share/userfiles/templates/default.wuiManageBackends.html
@@ -46,7 +46,6 @@ lang = {$lang};
                 </select>
             </td>
         </tr>
-        <!-- oh, it's time for a red wine - tasty :-) -->
         <tr>
             <td class="tdlabel" colspan="2" align="center">
                 <input class="submit" type="submit" name="submit" 
value="{$langSave}" />
@@ -56,6 +55,7 @@ lang = {$lang};
 </form>
 
 <form name="backend_edit" id="backend_edit" method="POST" 
action="javascript:submitFrontendForm('{$htmlBase}/server/core/ajax_handler.php?mod=MainCfg&amp;act=doBackendEdit',
 'backend_edit');" onsubmit="return check_backend_edit();">
+    <input type="hidden" name="backendtype" value="" />
     <table name="mytable" class="mytable" id="table_backend_edit">
         <tr><th class="cat" colspan="2"><h2>{$langEditBackend}</h2></th></tr>
         <tr>
@@ -91,4 +91,4 @@ lang = {$lang};
             </td>
         </tr>
     </table>
-</form>
\ No newline at end of file
+</form>


------------------------------------------------------------------------------
Ridiculously easy VDI. With Citrix VDI-in-a-Box, you don't need a complex
infrastructure or vast IT resources to deliver seamless, secure access to
virtual desktops. With this all-in-one solution, easily deploy virtual 
desktops for less than the cost of PCs and save 60% on VDI infrastructure 
costs. Try it free! http://p.sf.net/sfu/Citrix-VDIinabox
_______________________________________________
Nagvis-checkins mailing list
Nagvis-checkins@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/nagvis-checkins