Module: nagvis Branch: master Commit: 05a48d8b9cd1fc43a0a186f70562334529200ed2 URL: http://nagvis.git.sourceforge.net/git/gitweb.cgi?p=nagvis/nagvis;a=commit;h=05a48d8b9cd1fc43a0a186f70562334529200ed2
Author: LaMi <[email protected]> Date: Sat Mar 13 14:23:40 2010 +0100 #218 Iconset is being unset when creating or modifying a line/gadget --- share/frontend/wui/js/addmodify.js | 5 ++--- share/server/core/classes/GlobalMapCfg.php | 4 +++- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/share/frontend/wui/js/addmodify.js b/share/frontend/wui/js/addmodify.js index 7b343ec..40672b5 100644 --- a/share/frontend/wui/js/addmodify.js +++ b/share/frontend/wui/js/addmodify.js @@ -151,10 +151,9 @@ function validateMapCfgForm() { } } - // we verify we don't have both iconset and line_type defined + // Simply unset iconset when verifying a line if(document.addmodify.iconset && document.addmodify.iconset.value != '') { - alert(printLang(lang['onlyLineOrIcon'],'')); - return false; + document.addmodify.iconset.value = ''; } // we verify we have 2 x coordinates and 2 y coordinates diff --git a/share/server/core/classes/GlobalMapCfg.php b/share/server/core/classes/GlobalMapCfg.php index 85660cf..da6e6b9 100644 --- a/share/server/core/classes/GlobalMapCfg.php +++ b/share/server/core/classes/GlobalMapCfg.php @@ -949,7 +949,9 @@ class GlobalMapCfg { 'iconset' => Array('must' => 0, 'default' => '', 'match' => MATCH_STRING_NO_SPACE, - 'field_type' => 'dropdown'), + 'field_type' => 'dropdown', + 'depends_on' => 'view_type', + 'depends_value' => 'icon'), 'line_type' => Array('must' => 0, 'match' => MATCH_INTEGER, 'field_type' => 'dropdown', ------------------------------------------------------------------------------ Download Intel® Parallel Studio Eval Try the new software tools for yourself. Speed compiling, find bugs proactively, and fine-tune applications for parallel performance. See why Intel Parallel Studio got high marks during beta. http://p.sf.net/sfu/intel-sw-dev _______________________________________________ Nagvis-checkins mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/nagvis-checkins
