Module: nagvis Branch: master Commit: 8d57e4b3d3145e134aedeec883a09f99d539c9a6 URL: http://nagvis.git.sourceforge.net/git/gitweb.cgi?p=nagvis/nagvis;a=commit;h=8d57e4b3d3145e134aedeec883a09f99d539c9a6
Author: Lars Michelsen <[email protected]> Date: Wed Sep 22 19:12:45 2010 +0200 Fixed main configuration dialog after adding new auth_ sections in main configuration --- share/frontend/wui/js/wui.js | 25 ++++++++++++--------- share/server/core/classes/WuiViewEditMainCfg.php | 2 +- 2 files changed, 15 insertions(+), 12 deletions(-) diff --git a/share/frontend/wui/js/wui.js b/share/frontend/wui/js/wui.js index 80745f4..272be03 100644 --- a/share/frontend/wui/js/wui.js +++ b/share/frontend/wui/js/wui.js @@ -568,29 +568,30 @@ function toggleDependingFields(formName, name, value) { if(aFields[i].name.charAt(0) !== '_') { if(aFields[i].type != 'hidden' && aFields[i].type != 'submit') { // Handle different structures of main cfg and map cfg editing + var oConfig, sMasterName, sTypeName, sOptName, sFieldName; if(formName == 'edit_config') { - var sMasterName = name.replace(sTypeName+'_', ''); - var sTypeName = aFields[i].name.split('_')[0]; - var sOptName = aFields[i].name.replace(sTypeName+'_', ''); - var sFieldName = aFields[i].name; - var oConfig = validMainConfig; + sMasterName = name.replace(sTypeName+'_', ''); + sTypeName = aFields[i].name.split('_')[0]; + sOptName = aFields[i].name.replace(sTypeName+'_', ''); + sFieldName = aFields[i].name; + oConfig = validMainConfig; } else { - var sMasterName = name; - var sTypeName = document.getElementById(formName).type.value; - var sOptName = aFields[i].name; - var oConfig = validMapConfig; + sMasterName = name; + sTypeName = document.getElementById(formName).type.value; + sOptName = aFields[i].name; + oConfig = validMapConfig; } var sFieldName = aFields[i].name; // Show option fields when parent field value is equal and hide when // parent field value differs - if(oConfig[sTypeName][sOptName]['depends_on'] === sMasterName + if(oConfig[sTypeName] && oConfig[sTypeName][sOptName]['depends_on'] === sMasterName && oConfig[sTypeName][sOptName]['depends_value'] != value) { document.getElementById(sFieldName).parentNode.parentNode.style.display = 'none'; document.getElementById(sFieldName).value = ''; - } else if(oConfig[sTypeName][sOptName]['depends_on'] === sMasterName + } else if(oConfig[sTypeName] && oConfig[sTypeName][sOptName]['depends_on'] === sMasterName && oConfig[sTypeName][sOptName]['depends_value'] == value) { document.getElementById(sFieldName).parentNode.parentNode.style.display = ''; @@ -599,6 +600,8 @@ function toggleDependingFields(formName, name, value) { // try to display the default value toggleDefaultOption(sFieldName); } + if(!oConfig[sTypeName]) + alert('No data for type: '+sTypeName); } } } diff --git a/share/server/core/classes/WuiViewEditMainCfg.php b/share/server/core/classes/WuiViewEditMainCfg.php index 43d5137..d36700a 100644 --- a/share/server/core/classes/WuiViewEditMainCfg.php +++ b/share/server/core/classes/WuiViewEditMainCfg.php @@ -76,7 +76,7 @@ class WuiViewEditMainCfg { $i = 1; foreach($this->CORE->getMainCfg()->getValidConfig() AS $cat => $arr) { // don't display backend,rotation and internal options - if(!preg_match("/^backend/i", $cat) && !preg_match("/^internal$/i", $cat) && !preg_match("/^rotation/i", $cat)) { + if(!preg_match("/^(backend|internal|rotation|auth)/i", $cat)) { $ret .= '<tr><th class="cat" colspan="3"><h2>'.$cat.'</h2></th></tr>'; foreach($arr AS $propname => $prop) { ------------------------------------------------------------------------------ Start uncovering the many advantages of virtual appliances and start using them to simplify application deployment and accelerate your shift to cloud computing. http://p.sf.net/sfu/novell-sfdev2dev _______________________________________________ Nagvis-checkins mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/nagvis-checkins
