[mapguide-commits] r5463 - trunk/MgDev/Web/src/viewerfiles

[svn_mapguide at osgeo.org]

Author: liuar
Date: 2010-12-10 00:01:34 -0800 (Fri, 10 Dec 2010)
New Revision: 5463

Modified:
   trunk/MgDev/Web/src/viewerfiles/mainframe.templ
Log:
Fix ticket #1572 Help from context menu doesn't work well

session id was created in both !GettingStartedURL() and !MakeUrl in mainframe.templ.
I removed the duplicated session id from !MakeURL() if the command is !Help

Modified: trunk/MgDev/Web/src/viewerfiles/mainframe.templ
===================================================================
--- trunk/MgDev/Web/src/viewerfiles/mainframe.templ	2010-12-10 05:29:02 UTC (rev 5462)
+++ trunk/MgDev/Web/src/viewerfiles/mainframe.templ	2010-12-10 08:01:34 UTC (rev 5463)
@@ -908,7 +908,17 @@
         url += "WIDTH=400";
     else
         url += "WIDTH=" + taskWidth;
-    url += "&LOCALE=" + locale + "&SESSION=" + GetMapFrame().GetSessionId() + "&MAPNAME=" + encodeURIComponent(GetMapFrame().GetMapName()) + "&TGT=" + cmd.targetType + "&POPUP=" + (popup?1:0) + "&CMDINDEX=" + index;
+
+    // Don't append duplicate locale and session infomation for help cmd
+    // Seems other parameters are also useless, just keep them for compatibility
+    if(33 == cmd.action)
+    {
+        url += "&MAPNAME=" + encodeURIComponent(GetMapFrame().GetMapName()) + "&TGT=" + cmd.targetType + "&POPUP=" + (popup?1:0) + "&CMDINDEX=" + index;
+    }
+    else
+    {
+        url += "&LOCALE=" + locale + "&SESSION=" + GetMapFrame().GetSessionId() + "&MAPNAME=" + encodeURIComponent(GetMapFrame().GetMapName()) + "&TGT=" + cmd.targetType + "&POPUP=" + (popup?1:0) + "&CMDINDEX=" + index;
+    }
     return url;
 }