Return-Path:
Delivered-To: apmail-continuum-commits-archive@www.apache.org
Received: (qmail 15145 invoked from network); 2 Jun 2010 12:01:43 -0000
Received: from unknown (HELO mail.apache.org) (140.211.11.3)
by 140.211.11.9 with SMTP; 2 Jun 2010 12:01:43 -0000
Received: (qmail 92177 invoked by uid 500); 2 Jun 2010 12:01:43 -0000
Delivered-To: apmail-continuum-commits-archive@continuum.apache.org
Received: (qmail 92120 invoked by uid 500); 2 Jun 2010 12:01:42 -0000
Mailing-List: contact commits-help@continuum.apache.org; run by ezmlm
Precedence: bulk
List-Help:
List-Unsubscribe:
List-Post:
List-Id:
Reply-To: dev@continuum.apache.org
Delivered-To: mailing list commits@continuum.apache.org
Received: (qmail 92113 invoked by uid 99); 2 Jun 2010 12:01:42 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 02 Jun 2010 12:01:42 +0000
X-ASF-Spam-Status: No, hits=-1765.0 required=10.0
tests=ALL_TRUSTED,AWL
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 02 Jun 2010 12:01:41 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
id CE1582388978; Wed, 2 Jun 2010 12:01:20 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r950514 - in /continuum/trunk/continuum-webapp/src/main:
java/org/apache/continuum/web/action/ViewBuildsReportAction.java
resources/localization/Continuum.properties
webapp/WEB-INF/jsp/viewProjectBuildsReport.jsp
Date: Wed, 02 Jun 2010 12:01:20 -0000
To: commits@continuum.apache.org
From: jzurbano@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20100602120120.CE1582388978@eris.apache.org>
Author: jzurbano
Date: Wed Jun 2 12:01:20 2010
New Revision: 950514
URL: http://svn.apache.org/viewvc?rev=950514&view=rev
Log:
[CONTINUUM-2521] builds report page
* modified the field error message of rowCount since the field accepts the value of "10"
* modified page so that "No Results Found" is not displayed initially
* added reset of fields to default values
Modified:
continuum/trunk/continuum-webapp/src/main/java/org/apache/continuum/web/action/ViewBuildsReportAction.java
continuum/trunk/continuum-webapp/src/main/resources/localization/Continuum.properties
continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/viewProjectBuildsReport.jsp
Modified: continuum/trunk/continuum-webapp/src/main/java/org/apache/continuum/web/action/ViewBuildsReportAction.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/java/org/apache/continuum/web/action/ViewBuildsReportAction.java?rev=950514&r1=950513&r2=950514&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/java/org/apache/continuum/web/action/ViewBuildsReportAction.java (original)
+++ continuum/trunk/continuum-webapp/src/main/java/org/apache/continuum/web/action/ViewBuildsReportAction.java Wed Jun 2 12:01:20 2010
@@ -22,6 +22,7 @@ package org.apache.continuum.web.action;
import java.text.ParseException;
import java.util.ArrayList;
import java.util.Calendar;
+import java.util.Collections;
import java.util.Date;
import java.util.LinkedHashMap;
import java.util.List;
@@ -142,11 +143,12 @@ public class ViewBuildsReportAction
if ( rowCount < 10 )
{
// TODO: move to validation framework
- addFieldError( "rowCount", "Row count must be larger than 10." );
+ addFieldError( "rowCount", "Row count should be at least 10." );
return INPUT;
}
List buildResults = getContinuum().getBuildResultsInRange( fromDate, toDate, buildStatus, triggeredBy );
+ projectBuilds = Collections.emptyList();
if ( buildResults != null && !buildResults.isEmpty() )
{
Modified: continuum/trunk/continuum-webapp/src/main/resources/localization/Continuum.properties
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/resources/localization/Continuum.properties?rev=950514&r1=950513&r2=950514&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/resources/localization/Continuum.properties (original)
+++ continuum/trunk/continuum-webapp/src/main/resources/localization/Continuum.properties Wed Jun 2 12:01:20 2010
@@ -1267,6 +1267,7 @@ releasePrepare.input.error = Unable to g
# ----------------------------------------------------------------------
projectBuilds.report.title=Continuum - Project Builds Report
projectBuilds.report.section.title=Project Builds Report
+projectBuilds.report.button.reset=Reset
projectBuilds.report.startDate=Start Date
projectBuilds.report.endDate=End Date
projectBuilds.report.triggeredBy=Triggered By
@@ -1278,4 +1279,5 @@ projectBuilds.report.next=Next
projectBuilds.report.projectGroup = Project Group
projectBuilds.report.project=Project
projectBuilds.report.buildDate=Build Date
-projectBuilds.report.noResult=No Results Found
\ No newline at end of file
+projectBuilds.report.noResult=No Results Found
+
Modified: continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/viewProjectBuildsReport.jsp
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/viewProjectBuildsReport.jsp?rev=950514&r1=950513&r2=950514&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/viewProjectBuildsReport.jsp (original)
+++ continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/viewProjectBuildsReport.jsp Wed Jun 2 12:01:20 2010
@@ -32,8 +32,17 @@
@@ -57,130 +66,133 @@
+
-
+