You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@manifoldcf.apache.org by kw...@apache.org on 2010/09/17 21:51:00 UTC
svn commit: r998285 - in
/incubator/lcf/trunk/modules/framework/crawler-ui/src/main/webapp:
maxactivityreport.jsp maxbandwidthreport.jsp resultreport.jsp
simplereport.jsp
Author: kwright
Date: Fri Sep 17 19:50:59 2010
New Revision: 998285
URL: http://svn.apache.org/viewvc?rev=998285&view=rev
Log:
Fix for CONNECTORS-107. Activities list now selected upon entry to all report forms.
Modified:
incubator/lcf/trunk/modules/framework/crawler-ui/src/main/webapp/maxactivityreport.jsp
incubator/lcf/trunk/modules/framework/crawler-ui/src/main/webapp/maxbandwidthreport.jsp
incubator/lcf/trunk/modules/framework/crawler-ui/src/main/webapp/resultreport.jsp
incubator/lcf/trunk/modules/framework/crawler-ui/src/main/webapp/simplereport.jsp
Modified: incubator/lcf/trunk/modules/framework/crawler-ui/src/main/webapp/maxactivityreport.jsp
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/framework/crawler-ui/src/main/webapp/maxactivityreport.jsp?rev=998285&r1=998284&r2=998285&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/framework/crawler-ui/src/main/webapp/maxactivityreport.jsp (original)
+++ incubator/lcf/trunk/modules/framework/crawler-ui/src/main/webapp/maxactivityreport.jsp Fri Sep 17 19:50:59 2010
@@ -176,9 +176,15 @@ if (maintenanceUnderway == false)
String reportConnection = variableContext.getParameter("reportconnection");
if (reportConnection == null)
reportConnection = "";
- String[] reportActivities = variableContext.getParameterValues("reportactivities");
- if (reportActivities == null)
- reportActivities = new String[0];
+ String[] reportActivities;
+ if (variableContext.getParameter("reportactivities_posted") != null)
+ {
+ reportActivities = variableContext.getParameterValues("reportactivities");
+ if (reportActivities == null)
+ reportActivities = new String[0];
+ }
+ else
+ reportActivities = null;
// Get the current time, so we can fill in default values where possible.
long currentTime = System.currentTimeMillis();
@@ -420,6 +426,7 @@ if (maintenanceUnderway == false)
{
%>
<td class="description" colspan="1">Activities:</td><td class="value" colspan="1">
+ <input type="hidden" name="reportactivities_posted" value="true"/>
<select multiple="true" name="reportactivities" size="3">
<%
i = 0;
Modified: incubator/lcf/trunk/modules/framework/crawler-ui/src/main/webapp/maxbandwidthreport.jsp
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/framework/crawler-ui/src/main/webapp/maxbandwidthreport.jsp?rev=998285&r1=998284&r2=998285&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/framework/crawler-ui/src/main/webapp/maxbandwidthreport.jsp (original)
+++ incubator/lcf/trunk/modules/framework/crawler-ui/src/main/webapp/maxbandwidthreport.jsp Fri Sep 17 19:50:59 2010
@@ -176,9 +176,15 @@ if (maintenanceUnderway == false)
String reportConnection = variableContext.getParameter("reportconnection");
if (reportConnection == null)
reportConnection = "";
- String[] reportActivities = variableContext.getParameterValues("reportactivities");
- if (reportActivities == null)
- reportActivities = new String[0];
+ String[] reportActivities;
+ if (variableContext.getParameter("reportactivities_posted") != null)
+ {
+ reportActivities = variableContext.getParameterValues("reportactivities");
+ if (reportActivities == null)
+ reportActivities = new String[0];
+ }
+ else
+ reportActivities = null;
// Get the current time, so we can fill in default values where possible.
long currentTime = System.currentTimeMillis();
@@ -420,6 +426,7 @@ if (maintenanceUnderway == false)
{
%>
<td class="description" colspan="1">Activities:</td><td class="value" colspan="1">
+ <input type="hidden" name="reportactivities_posted" value="true"/>
<select multiple="true" name="reportactivities" size="3">
<%
i = 0;
Modified: incubator/lcf/trunk/modules/framework/crawler-ui/src/main/webapp/resultreport.jsp
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/framework/crawler-ui/src/main/webapp/resultreport.jsp?rev=998285&r1=998284&r2=998285&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/framework/crawler-ui/src/main/webapp/resultreport.jsp (original)
+++ incubator/lcf/trunk/modules/framework/crawler-ui/src/main/webapp/resultreport.jsp Fri Sep 17 19:50:59 2010
@@ -205,9 +205,15 @@ if (maintenanceUnderway == false)
String reportConnection = variableContext.getParameter("reportconnection");
if (reportConnection == null)
reportConnection = "";
- String[] reportActivities = variableContext.getParameterValues("reportactivities");
- if (reportActivities == null)
- reportActivities = new String[0];
+ String[] reportActivities;
+ if (variableContext.getParameter("reportactivities_posted") != null)
+ {
+ reportActivities = variableContext.getParameterValues("reportactivities");
+ if (reportActivities == null)
+ reportActivities = new String[0];
+ }
+ else
+ reportActivities = null;
// Get the current time, so we can fill in default values where possible.
long currentTime = System.currentTimeMillis();
@@ -447,6 +453,7 @@ if (maintenanceUnderway == false)
{
%>
<td class="description" colspan="1">Activities:</td><td class="value" colspan="1">
+ <input type="hidden" name="reportactivities_posted" value="true"/>
<select multiple="true" name="reportactivities" size="3">
<%
i = 0;
Modified: incubator/lcf/trunk/modules/framework/crawler-ui/src/main/webapp/simplereport.jsp
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/framework/crawler-ui/src/main/webapp/simplereport.jsp?rev=998285&r1=998284&r2=998285&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/framework/crawler-ui/src/main/webapp/simplereport.jsp (original)
+++ incubator/lcf/trunk/modules/framework/crawler-ui/src/main/webapp/simplereport.jsp Fri Sep 17 19:50:59 2010
@@ -140,9 +140,15 @@ if (maintenanceUnderway == false)
String reportConnection = variableContext.getParameter("reportconnection");
if (reportConnection == null)
reportConnection = "";
- String[] reportActivities = variableContext.getParameterValues("reportactivities");
- if (reportActivities == null)
- reportActivities = new String[0];
+ String[] reportActivities;
+ if (variableContext.getParameter("reportactivities_posted") != null)
+ {
+ reportActivities = variableContext.getParameterValues("reportactivities");
+ if (reportActivities == null)
+ reportActivities = new String[0];
+ }
+ else
+ reportActivities = null;
// Get the current time, so we can fill in default values where possible.
long currentTime = System.currentTimeMillis();
@@ -376,6 +382,7 @@ if (maintenanceUnderway == false)
{
%>
<td class="description" colspan="1">Activities:</td><td class="value" colspan="1">
+ <input type="hidden" name="reportactivities_posted" value="true"/>
<select multiple="true" name="reportactivities" size="3">
<%
i = 0;