Author: kwright
Date: Mon Oct 24 14:43:04 2016
New Revision: 1766416
URL: http://svn.apache.org/viewvc?rev=1766416&view=rev
Log:
Fix for CONNECTORS-1343. Committed on behalf of Markus Schuch.
Modified:
manifoldcf/trunk/CHANGES.txt
manifoldcf/trunk/framework/crawler-ui/src/main/webapp/maxactivityreport.jsp
manifoldcf/trunk/framework/crawler-ui/src/main/webapp/maxbandwidthreport.jsp
manifoldcf/trunk/framework/crawler-ui/src/main/webapp/resultreport.jsp
manifoldcf/trunk/framework/crawler-ui/src/main/webapp/simplereport.jsp
Modified: manifoldcf/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/CHANGES.txt?rev=1766416&r1=1766415&r2=1766416&view=diff
==============================================================================
--- manifoldcf/trunk/CHANGES.txt (original)
+++ manifoldcf/trunk/CHANGES.txt Mon Oct 24 14:43:04 2016
@@ -3,6 +3,10 @@ $Id$
======================= 2.6-dev =====================
+CONNETORS-1343: Allow maximum year in report UI to be set based
+on current year.
+(Markus Schuch)
+
CONNECTORS-1342: Bad UI logic for "path" field in livelink connector.
(Lena Gurevich, Karl Wright)
Modified:
manifoldcf/trunk/framework/crawler-ui/src/main/webapp/maxactivityreport.jsp
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/framework/crawler-ui/src/main/webapp/maxactivityreport.jsp?rev=1766416&r1=1766415&r2=1766416&view=diff
==============================================================================
--- manifoldcf/trunk/framework/crawler-ui/src/main/webapp/maxactivityreport.jsp
(original)
+++ manifoldcf/trunk/framework/crawler-ui/src/main/webapp/maxactivityreport.jsp
Mon Oct 24 14:43:04 2016
@@ -524,20 +524,10 @@ function isInteger(value)
</select><nobr/>,<nobr/>
<select class="schedulepulldown" name='reportstartyear'
size="3">
<option value=""
<%=(startYear.length()==0)?"selected=\"selected\"":""%>>--
<%=Messages.getBodyString(pageContext.getRequest().getLocale(),"maxactivityreport.NotSpecified")%>
--</option>
- <option value="2005"
<%=(startYear.equals("2005"))?"selected=\"selected\"":""%>>2005</option>
- <option value="2006"
<%=(startYear.equals("2006"))?"selected=\"selected\"":""%>>2006</option>
- <option value="2007"
<%=(startYear.equals("2007"))?"selected=\"selected\"":""%>>2007</option>
- <option value="2008"
<%=(startYear.equals("2008"))?"selected=\"selected\"":""%>>2008</option>
- <option value="2009"
<%=(startYear.equals("2009"))?"selected=\"selected\"":""%>>2009</option>
- <option value="2010"
<%=(startYear.equals("2010"))?"selected=\"selected\"":""%>>2010</option>
- <option value="2011"
<%=(startYear.equals("2011"))?"selected=\"selected\"":""%>>2011</option>
- <option value="2012"
<%=(startYear.equals("2012"))?"selected=\"selected\"":""%>>2012</option>
- <option value="2013"
<%=(startYear.equals("2013"))?"selected=\"selected\"":""%>>2013</option>
- <option value="2014"
<%=(startYear.equals("2014"))?"selected=\"selected\"":""%>>2014</option>
- <option value="2015"
<%=(startYear.equals("2015"))?"selected=\"selected\"":""%>>2015</option>
- <option value="2016"
<%=(startYear.equals("2016"))?"selected=\"selected\"":""%>>2016</option>
- <option value="2017"
<%=(startYear.equals("2017"))?"selected=\"selected\"":""%>>2017</option>
- <option value="2018"
<%=(startYear.equals("2018"))?"selected=\"selected\"":""%>>2018</option>
+ <% for(int year=2005; year <=
java.util.Calendar.getInstance().get(java.util.Calendar.YEAR); year++) {
+ String selected =
(startYear.equals(""+year))?"selected=\"selected\"":""; %>
+ <option value="<%= year %>" <%= selected %>><%= year
%></option>
+ <% } %>
</select>
</td>
</tr>
@@ -622,20 +612,10 @@ function isInteger(value)
</select><nobr/>,<nobr/>
<select class="schedulepulldown" name='reportendyear' size="3">
<option value=""
<%=(endYear.length()==0)?"selected=\"selected\"":""%>>--
<%=Messages.getBodyString(pageContext.getRequest().getLocale(),"maxactivityreport.NotSpecified")%>
--</option>
- <option value="2005"
<%=(endYear.equals("2005"))?"selected=\"selected\"":""%>>2005</option>
- <option value="2006"
<%=(endYear.equals("2006"))?"selected=\"selected\"":""%>>2006</option>
- <option value="2007"
<%=(endYear.equals("2007"))?"selected=\"selected\"":""%>>2007</option>
- <option value="2008"
<%=(endYear.equals("2008"))?"selected=\"selected\"":""%>>2008</option>
- <option value="2009"
<%=(endYear.equals("2009"))?"selected=\"selected\"":""%>>2009</option>
- <option value="2010"
<%=(endYear.equals("2010"))?"selected=\"selected\"":""%>>2010</option>
- <option value="2011"
<%=(endYear.equals("2011"))?"selected=\"selected\"":""%>>2011</option>
- <option value="2012"
<%=(endYear.equals("2012"))?"selected=\"selected\"":""%>>2012</option>
- <option value="2013"
<%=(endYear.equals("2013"))?"selected=\"selected\"":""%>>2013</option>
- <option value="2014"
<%=(endYear.equals("2014"))?"selected=\"selected\"":""%>>2014</option>
- <option value="2015"
<%=(endYear.equals("2015"))?"selected=\"selected\"":""%>>2015</option>
- <option value="2016"
<%=(endYear.equals("2016"))?"selected=\"selected\"":""%>>2016</option>
- <option value="2017"
<%=(endYear.equals("2017"))?"selected=\"selected\"":""%>>2017</option>
- <option value="2018"
<%=(endYear.equals("2018"))?"selected=\"selected\"":""%>>2018</option>
+ <% for(int year=2005; year <=
java.util.Calendar.getInstance().get(java.util.Calendar.YEAR); year++) {
+ String selected =
(startYear.equals(""+year))?"selected=\"selected\"":""; %>
+ <option value="<%= year %>" <%= selected %>><%= year
%></option>
+ <% } %>
</select>
</td>
</tr>
Modified:
manifoldcf/trunk/framework/crawler-ui/src/main/webapp/maxbandwidthreport.jsp
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/framework/crawler-ui/src/main/webapp/maxbandwidthreport.jsp?rev=1766416&r1=1766415&r2=1766416&view=diff
==============================================================================
---
manifoldcf/trunk/framework/crawler-ui/src/main/webapp/maxbandwidthreport.jsp
(original)
+++
manifoldcf/trunk/framework/crawler-ui/src/main/webapp/maxbandwidthreport.jsp
Mon Oct 24 14:43:04 2016
@@ -524,20 +524,10 @@ function isInteger(value)
</select><nobr/>,<nobr/>
<select class="schedulepulldown" name='reportstartyear'
size="3">
<option value=""
<%=(startYear.length()==0)?"selected=\"selected\"":""%>>--
<%=Messages.getBodyString(pageContext.getRequest().getLocale(),"maxbandwidthreport.NotSpecified")%>
--</option>
- <option value="2005"
<%=(startYear.equals("2005"))?"selected=\"selected\"":""%>>2005</option>
- <option value="2006"
<%=(startYear.equals("2006"))?"selected=\"selected\"":""%>>2006</option>
- <option value="2007"
<%=(startYear.equals("2007"))?"selected=\"selected\"":""%>>2007</option>
- <option value="2008"
<%=(startYear.equals("2008"))?"selected=\"selected\"":""%>>2008</option>
- <option value="2009"
<%=(startYear.equals("2009"))?"selected=\"selected\"":""%>>2009</option>
- <option value="2010"
<%=(startYear.equals("2010"))?"selected=\"selected\"":""%>>2010</option>
- <option value="2011"
<%=(startYear.equals("2011"))?"selected=\"selected\"":""%>>2011</option>
- <option value="2012"
<%=(startYear.equals("2012"))?"selected=\"selected\"":""%>>2012</option>
- <option value="2013"
<%=(startYear.equals("2013"))?"selected=\"selected\"":""%>>2013</option>
- <option value="2014"
<%=(startYear.equals("2014"))?"selected=\"selected\"":""%>>2014</option>
- <option value="2015"
<%=(startYear.equals("2015"))?"selected=\"selected\"":""%>>2015</option>
- <option value="2016"
<%=(startYear.equals("2016"))?"selected=\"selected\"":""%>>2016</option>
- <option value="2017"
<%=(startYear.equals("2017"))?"selected=\"selected\"":""%>>2017</option>
- <option value="2018"
<%=(startYear.equals("2018"))?"selected=\"selected\"":""%>>2018</option>
+ <% for(int year=2005; year <=
java.util.Calendar.getInstance().get(java.util.Calendar.YEAR); year++) {
+ String selected =
(startYear.equals(""+year))?"selected=\"selected\"":""; %>
+ <option value="<%= year %>" <%= selected %>><%= year
%></option>
+ <% } %>
</select>
</td>
</tr>
@@ -622,20 +612,10 @@ function isInteger(value)
</select><nobr/>,<nobr/>
<select class="schedulepulldown" name='reportendyear' size="3">
<option value=""
<%=(endYear.length()==0)?"selected=\"selected\"":""%>>--
<%=Messages.getBodyString(pageContext.getRequest().getLocale(),"maxbandwidthreport.NotSpecified")%>
--</option>
- <option value="2005"
<%=(endYear.equals("2005"))?"selected=\"selected\"":""%>>2005</option>
- <option value="2006"
<%=(endYear.equals("2006"))?"selected=\"selected\"":""%>>2006</option>
- <option value="2007"
<%=(endYear.equals("2007"))?"selected=\"selected\"":""%>>2007</option>
- <option value="2008"
<%=(endYear.equals("2008"))?"selected=\"selected\"":""%>>2008</option>
- <option value="2009"
<%=(endYear.equals("2009"))?"selected=\"selected\"":""%>>2009</option>
- <option value="2010"
<%=(endYear.equals("2010"))?"selected=\"selected\"":""%>>2010</option>
- <option value="2011"
<%=(endYear.equals("2011"))?"selected=\"selected\"":""%>>2011</option>
- <option value="2012"
<%=(endYear.equals("2012"))?"selected=\"selected\"":""%>>2012</option>
- <option value="2013"
<%=(endYear.equals("2013"))?"selected=\"selected\"":""%>>2013</option>
- <option value="2014"
<%=(endYear.equals("2014"))?"selected=\"selected\"":""%>>2014</option>
- <option value="2015"
<%=(endYear.equals("2015"))?"selected=\"selected\"":""%>>2015</option>
- <option value="2016"
<%=(endYear.equals("2016"))?"selected=\"selected\"":""%>>2016</option>
- <option value="2017"
<%=(endYear.equals("2017"))?"selected=\"selected\"":""%>>2017</option>
- <option value="2018"
<%=(endYear.equals("2018"))?"selected=\"selected\"":""%>>2018</option>
+ <% for(int year=2005; year <=
java.util.Calendar.getInstance().get(java.util.Calendar.YEAR); year++) {
+ String selected =
(startYear.equals(""+year))?"selected=\"selected\"":""; %>
+ <option value="<%= year %>" <%= selected %>><%= year
%></option>
+ <% } %>
</select>
</td>
</tr>
Modified: manifoldcf/trunk/framework/crawler-ui/src/main/webapp/resultreport.jsp
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/framework/crawler-ui/src/main/webapp/resultreport.jsp?rev=1766416&r1=1766415&r2=1766416&view=diff
==============================================================================
--- manifoldcf/trunk/framework/crawler-ui/src/main/webapp/resultreport.jsp
(original)
+++ manifoldcf/trunk/framework/crawler-ui/src/main/webapp/resultreport.jsp Mon
Oct 24 14:43:04 2016
@@ -551,20 +551,10 @@ function isInteger(value)
</select><nobr/>,<nobr/>
<select class="schedulepulldown" name='reportstartyear'
size="3">
<option value=""
<%=(startYear.length()==0)?"selected=\"selected\"":""%>>--
<%=Messages.getBodyString(pageContext.getRequest().getLocale(),"resultreport.NotSpecified")%>
--</option>
- <option value="2005"
<%=(startYear.equals("2005"))?"selected=\"selected\"":""%>>2005</option>
- <option value="2006"
<%=(startYear.equals("2006"))?"selected=\"selected\"":""%>>2006</option>
- <option value="2007"
<%=(startYear.equals("2007"))?"selected=\"selected\"":""%>>2007</option>
- <option value="2008"
<%=(startYear.equals("2008"))?"selected=\"selected\"":""%>>2008</option>
- <option value="2009"
<%=(startYear.equals("2009"))?"selected=\"selected\"":""%>>2009</option>
- <option value="2010"
<%=(startYear.equals("2010"))?"selected=\"selected\"":""%>>2010</option>
- <option value="2011"
<%=(startYear.equals("2011"))?"selected=\"selected\"":""%>>2011</option>
- <option value="2012"
<%=(startYear.equals("2012"))?"selected=\"selected\"":""%>>2012</option>
- <option value="2013"
<%=(startYear.equals("2013"))?"selected=\"selected\"":""%>>2013</option>
- <option value="2014"
<%=(startYear.equals("2014"))?"selected=\"selected\"":""%>>2014</option>
- <option value="2015"
<%=(startYear.equals("2015"))?"selected=\"selected\"":""%>>2015</option>
- <option value="2016"
<%=(startYear.equals("2016"))?"selected=\"selected\"":""%>>2016</option>
- <option value="2017"
<%=(startYear.equals("2017"))?"selected=\"selected\"":""%>>2017</option>
- <option value="2018"
<%=(startYear.equals("2018"))?"selected=\"selected\"":""%>>2018</option>
+ <% for(int year=2005; year <=
java.util.Calendar.getInstance().get(java.util.Calendar.YEAR); year++) {
+ String selected =
(startYear.equals(""+year))?"selected=\"selected\"":""; %>
+ <option value="<%= year %>" <%= selected %>><%= year
%></option>
+ <% } %>
</select>
</td>
</tr>
@@ -649,20 +639,10 @@ function isInteger(value)
</select><nobr/>,<nobr/>
<select class="schedulepulldown" name='reportendyear' size="3">
<option value=""
<%=(endYear.length()==0)?"selected=\"selected\"":""%>>--
<%=Messages.getBodyString(pageContext.getRequest().getLocale(),"resultreport.NotSpecified")%>
--</option>
- <option value="2005"
<%=(endYear.equals("2005"))?"selected=\"selected\"":""%>>2005</option>
- <option value="2006"
<%=(endYear.equals("2006"))?"selected=\"selected\"":""%>>2006</option>
- <option value="2007"
<%=(endYear.equals("2007"))?"selected=\"selected\"":""%>>2007</option>
- <option value="2008"
<%=(endYear.equals("2008"))?"selected=\"selected\"":""%>>2008</option>
- <option value="2009"
<%=(endYear.equals("2009"))?"selected=\"selected\"":""%>>2009</option>
- <option value="2010"
<%=(endYear.equals("2010"))?"selected=\"selected\"":""%>>2010</option>
- <option value="2011"
<%=(endYear.equals("2011"))?"selected=\"selected\"":""%>>2011</option>
- <option value="2012"
<%=(endYear.equals("2012"))?"selected=\"selected\"":""%>>2012</option>
- <option value="2013"
<%=(endYear.equals("2013"))?"selected=\"selected\"":""%>>2013</option>
- <option value="2014"
<%=(endYear.equals("2014"))?"selected=\"selected\"":""%>>2014</option>
- <option value="2015"
<%=(endYear.equals("2015"))?"selected=\"selected\"":""%>>2015</option>
- <option value="2016"
<%=(endYear.equals("2016"))?"selected=\"selected\"":""%>>2016</option>
- <option value="2017"
<%=(endYear.equals("2017"))?"selected=\"selected\"":""%>>2017</option>
- <option value="2018"
<%=(endYear.equals("2018"))?"selected=\"selected\"":""%>>2018</option>
+ <% for(int year=2005; year <=
java.util.Calendar.getInstance().get(java.util.Calendar.YEAR); year++) {
+ String selected =
(startYear.equals(""+year))?"selected=\"selected\"":""; %>
+ <option value="<%= year %>" <%= selected %>><%= year
%></option>
+ <% } %>
</select>
</td>
</tr>
Modified: manifoldcf/trunk/framework/crawler-ui/src/main/webapp/simplereport.jsp
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/framework/crawler-ui/src/main/webapp/simplereport.jsp?rev=1766416&r1=1766415&r2=1766416&view=diff
==============================================================================
--- manifoldcf/trunk/framework/crawler-ui/src/main/webapp/simplereport.jsp
(original)
+++ manifoldcf/trunk/framework/crawler-ui/src/main/webapp/simplereport.jsp Mon
Oct 24 14:43:04 2016
@@ -480,20 +480,10 @@ function isInteger(value)
</select><nobr/>,<nobr/>
<select class="schedulepulldown" name='reportstartyear'
size="3">
<option value=""
<%=(startYear.length()==0)?"selected=\"selected\"":""%>>--
<%=Messages.getBodyString(pageContext.getRequest().getLocale(),"simplereport.NotSpecified")%>
--</option>
- <option value="2005"
<%=(startYear.equals("2005"))?"selected=\"selected\"":""%>>2005</option>
- <option value="2006"
<%=(startYear.equals("2006"))?"selected=\"selected\"":""%>>2006</option>
- <option value="2007"
<%=(startYear.equals("2007"))?"selected=\"selected\"":""%>>2007</option>
- <option value="2008"
<%=(startYear.equals("2008"))?"selected=\"selected\"":""%>>2008</option>
- <option value="2009"
<%=(startYear.equals("2009"))?"selected=\"selected\"":""%>>2009</option>
- <option value="2010"
<%=(startYear.equals("2010"))?"selected=\"selected\"":""%>>2010</option>
- <option value="2011"
<%=(startYear.equals("2011"))?"selected=\"selected\"":""%>>2011</option>
- <option value="2012"
<%=(startYear.equals("2012"))?"selected=\"selected\"":""%>>2012</option>
- <option value="2013"
<%=(startYear.equals("2013"))?"selected=\"selected\"":""%>>2013</option>
- <option value="2014"
<%=(startYear.equals("2014"))?"selected=\"selected\"":""%>>2014</option>
- <option value="2015"
<%=(startYear.equals("2015"))?"selected=\"selected\"":""%>>2015</option>
- <option value="2016"
<%=(startYear.equals("2016"))?"selected=\"selected\"":""%>>2016</option>
- <option value="2017"
<%=(startYear.equals("2017"))?"selected=\"selected\"":""%>>2017</option>
- <option value="2018"
<%=(startYear.equals("2018"))?"selected=\"selected\"":""%>>2018</option>
+ <% for(int year=2005; year <=
java.util.Calendar.getInstance().get(java.util.Calendar.YEAR); year++) {
+ String selected =
(startYear.equals(""+year))?"selected=\"selected\"":""; %>
+ <option value="<%= year %>" <%= selected %>><%= year
%></option>
+ <% } %>
</select>
</td>
</tr>
@@ -578,20 +568,10 @@ function isInteger(value)
</select><nobr/>,<nobr/>
<select class="schedulepulldown" name='reportendyear' size="3">
<option value=""
<%=(endYear.length()==0)?"selected=\"selected\"":""%>>--
<%=Messages.getBodyString(pageContext.getRequest().getLocale(),"simplereport.NotSpecified")%>
--</option>
- <option value="2005"
<%=(endYear.equals("2005"))?"selected=\"selected\"":""%>>2005</option>
- <option value="2006"
<%=(endYear.equals("2006"))?"selected=\"selected\"":""%>>2006</option>
- <option value="2007"
<%=(endYear.equals("2007"))?"selected=\"selected\"":""%>>2007</option>
- <option value="2008"
<%=(endYear.equals("2008"))?"selected=\"selected\"":""%>>2008</option>
- <option value="2009"
<%=(endYear.equals("2009"))?"selected=\"selected\"":""%>>2009</option>
- <option value="2010"
<%=(endYear.equals("2010"))?"selected=\"selected\"":""%>>2010</option>
- <option value="2011"
<%=(endYear.equals("2011"))?"selected=\"selected\"":""%>>2011</option>
- <option value="2012"
<%=(endYear.equals("2012"))?"selected=\"selected\"":""%>>2012</option>
- <option value="2013"
<%=(endYear.equals("2013"))?"selected=\"selected\"":""%>>2013</option>
- <option value="2014"
<%=(endYear.equals("2014"))?"selected=\"selected\"":""%>>2014</option>
- <option value="2015"
<%=(endYear.equals("2015"))?"selected=\"selected\"":""%>>2015</option>
- <option value="2016"
<%=(endYear.equals("2016"))?"selected=\"selected\"":""%>>2016</option>
- <option value="2017"
<%=(endYear.equals("2017"))?"selected=\"selected\"":""%>>2017</option>
- <option value="2018"
<%=(endYear.equals("2018"))?"selected=\"selected\"":""%>>2018</option>
+ <% for(int year=2005; year <=
java.util.Calendar.getInstance().get(java.util.Calendar.YEAR); year++) {
+ String selected =
(startYear.equals(""+year))?"selected=\"selected\"":""; %>
+ <option value="<%= year %>" <%= selected %>><%= year
%></option>
+ <% } %>
</select>
</td>
</tr>
