[mapguide-commits] r5912 - in branches/2.2/MgDev/Web/src:
mapviewerjava mapviewernet mapviewerphp
svn_mapguide at osgeo.org
svn_mapguide at osgeo.org
Fri Jun 3 09:12:36 EDT 2011
Author: jng
Date: 2011-06-03 06:12:36 -0700 (Fri, 03 Jun 2011)
New Revision: 5912
Modified:
branches/2.2/MgDev/Web/src/mapviewerjava/mainframe.jsp
branches/2.2/MgDev/Web/src/mapviewernet/mainframe.aspx
branches/2.2/MgDev/Web/src/mapviewerphp/mainframe.php
Log:
#1712: Apply layer constraints to InvokeURL commands regardless of whether parameters are specified or not.
Modified: branches/2.2/MgDev/Web/src/mapviewerjava/mainframe.jsp
===================================================================
--- branches/2.2/MgDev/Web/src/mapviewerjava/mainframe.jsp 2011-06-03 12:40:53 UTC (rev 5911)
+++ branches/2.2/MgDev/Web/src/mapviewerjava/mainframe.jsp 2011-06-03 13:12:36 UTC (rev 5912)
@@ -238,13 +238,13 @@
String param = MessageFormat.format("navParams{0,number,integer}[{1,number,integer}] = new NavParam(\"{2}\", \"{3}\");\n", formatArgs);
paramObjs = paramObjs + param;
}
- for( int j = 0; j < invokeUrlCmd.GetLayerCount(); j++ )
- {
- Object[] formatArgs = { new Integer(navCmdIndex), new Integer(j), invokeUrlCmd.GetLayerNameAt(j) };
- String layer = MessageFormat.format("layers{0,number,integer}[{1,number,integer}] = \"{2}\";\n", formatArgs);
- layers = layers + layer;
- }
}
+ for( int j = 0; j < invokeUrlCmd.GetLayerCount(); j++ )
+ {
+ Object[] formatArgs = { new Integer(navCmdIndex), new Integer(j), invokeUrlCmd.GetLayerNameAt(j) };
+ String layer = MessageFormat.format("layers{0,number,integer}[{1,number,integer}] = \"{2}\";\n", formatArgs);
+ layers = layers + layer;
+ }
cmdObjects = cmdObjects + paramObjs + layers;
if(invokeUrlCmd.DisabledIfSelectionEmpty() || invokeUrlCmd.GetLayerCount() > 0)
Modified: branches/2.2/MgDev/Web/src/mapviewernet/mainframe.aspx
===================================================================
--- branches/2.2/MgDev/Web/src/mapviewernet/mainframe.aspx 2011-06-03 12:40:53 UTC (rev 5911)
+++ branches/2.2/MgDev/Web/src/mapviewernet/mainframe.aspx 2011-06-03 13:12:36 UTC (rev 5912)
@@ -236,18 +236,17 @@
String layers = "var layers" + navCmdIndex + " = new Array();\n";
if (invokeUrlCmd.GetParameterCount() > 0)
{
- int j = 0;
- for (j = 0; j < invokeUrlCmd.GetParameterCount(); j++)
+ for (int j = 0; j < invokeUrlCmd.GetParameterCount(); j++)
{
String param = String.Format("navParams{0}[{1}] = new NavParam(\"{2}\", \"{3}\");\n", navCmdIndex, j, invokeUrlCmd.GetParameterNameAt(j), invokeUrlCmd.GetParameterValueAt(j));
parameters = parameters + param;
}
- for (j = 0; j < invokeUrlCmd.GetLayerCount(); j++)
- {
- String layer = String.Format("layers{0}[{1}] = \"{2}\";\n", navCmdIndex, j, invokeUrlCmd.GetLayerNameAt(j));
- layers = layers + layer;
- }
}
+ for (int j = 0; j < invokeUrlCmd.GetLayerCount(); j++)
+ {
+ String layer = String.Format("layers{0}[{1}] = \"{2}\";\n", navCmdIndex, j, invokeUrlCmd.GetLayerNameAt(j));
+ layers = layers + layer;
+ }
cmdObjects = cmdObjects + parameters + layers;
if (invokeUrlCmd.DisabledIfSelectionEmpty() || invokeUrlCmd.GetLayerCount() > 0)
Modified: branches/2.2/MgDev/Web/src/mapviewerphp/mainframe.php
===================================================================
--- branches/2.2/MgDev/Web/src/mapviewerphp/mainframe.php 2011-06-03 12:40:53 UTC (rev 5911)
+++ branches/2.2/MgDev/Web/src/mapviewerphp/mainframe.php 2011-06-03 13:12:36 UTC (rev 5912)
@@ -251,12 +251,12 @@
$param = sprintf("navParams%d[%d] = new NavParam(\"%s\", \"%s\");\n", $navCmdIndex, $j, $cmd->GetParameterNameAt($j), $cmd->GetParameterValueAt($j));
$params = $params . $param;
}
- for($j = 0; $j < $cmd->GetLayerCount(); $j++)
- {
- $layer = sprintf("layers%d[%d] = \"%s\";\n", $navCmdIndex, $j, $cmd->GetLayerNameAt($j));
- $layers = $layers . $layer;
- }
}
+ for($j = 0; $j < $cmd->GetLayerCount(); $j++)
+ {
+ $layer = sprintf("layers%d[%d] = \"%s\";\n", $navCmdIndex, $j, $cmd->GetLayerNameAt($j));
+ $layers = $layers . $layer;
+ }
$cmdObjects = $cmdObjects . $params . $layers;
if($cmd->DisabledIfSelectionEmpty() || $cmd->GetLayerCount() > 0)
{
More information about the mapguide-commits
mailing list