[Nagvis-checkins] SF.net Git: nagvis: Bugfix: Fixed pre-selected values in map options modify dialog

[lars]

Author:   Lars Michelsen <l...@larsmichelsen.com>
Date:     Thu May 24 22:30:45 2012 +0200
Committer:   Lars Michelsen <l...@larsmichelsen.com>
Commit-Date: Thu May 24 22:30:45 2012 +0200

Bugfix: Fixed pre-selected values in map options modify dialog

---

 ChangeLog                                     |    3 +++
 share/frontend/nagvis-js/js/frontend.js       |    2 +-
 share/userfiles/templates/default.header.html |    2 +-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index f9f7ff3..b2f55e2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,9 @@ Core
   * Checking conf.d directory modification time to detect removed config files
     to be able to delete the config cache in this case
 
+Frontend
+  * Bugfix: Fixed pre-selected values in map options modify dialog
+
 Installer
   * Automatically removing showautomaps option from nagvis.ini.php during 
update
 
diff --git a/share/frontend/nagvis-js/js/frontend.js 
b/share/frontend/nagvis-js/js/frontend.js
index 7839653..bb482dd 100644
--- a/share/frontend/nagvis-js/js/frontend.js
+++ b/share/frontend/nagvis-js/js/frontend.js
@@ -1421,7 +1421,7 @@ function getViewParams(update, userParams) {
 
     if(!userParams && isset(oViewProperties) && 
isset(oViewProperties['params'])) {
         var params = oViewProperties['params'];
-    } else if(isset(oViewProperties) && isset(oViewProperties['params'])) {
+    } else if(isset(oViewProperties) && isset(oViewProperties['user_params'])) 
{
         var params = oViewProperties['user_params'];
     } else {
         return '';
diff --git a/share/userfiles/templates/default.header.html 
b/share/userfiles/templates/default.header.html
index 00ad9aa..148318b 100644
--- a/share/userfiles/templates/default.header.html
+++ b/share/userfiles/templates/default.header.html
@@ -87,7 +87,7 @@
             </li>
             <li class="spacer"><hr /></li>
             <li><a href="#" 
onclick="showFrontendDialog(oGeneralProperties.path_server+'?mod=Map&amp;act=manageTmpl&amp;show={$currentMap}',
 '{$langMapManageTmpl}', 300)">{$langMapManageTmpl}</a></li>
-            <li><a href="#" 
onclick="showFrontendDialog(oGeneralProperties.path_server+'?mod=Map&amp;act=addModify&amp;show={$currentMap}&amp;object_id=0'+getViewParams(),
 '{$langMapOptions}');" class="underline">{$langMapOptions}</a></li>
+            <li><a href="#" 
onclick="showFrontendDialog(oGeneralProperties.path_server+'?mod=Map&amp;act=addModify&amp;show={$currentMap}&amp;object_id=0',
 '{$langMapOptions}');" class="underline">{$langMapOptions}</a></li>
         </ul>
     </li>
     {/if}


------------------------------------------------------------------------------
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and 
threat landscape has changed and how IT managers can respond. Discussions 
will include endpoint security, mobile security and the latest in malware 
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
_______________________________________________
Nagvis-checkins mailing list
Nagvis-checkins@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/nagvis-checkins