You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@continuum.apache.org by jm...@apache.org on 2009/05/14 00:23:47 UTC
svn commit: r774565 - in /continuum/trunk/continuum-webapp/src/main:
java/org/apache/maven/continuum/web/action/BuildProjectAction.java
webapp/WEB-INF/jsp/components/buildDefinitionGroupSummaryComponent.jsp
Author: jmorales
Date: Wed May 13 22:23:46 2009
New Revision: 774565
URL: http://svn.apache.org/viewvc?rev=774565&view=rev
Log:
merge -r 774554:774555 from 1.3.x branch
Modified:
continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/BuildProjectAction.java
continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/buildDefinitionGroupSummaryComponent.jsp
Modified: continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/BuildProjectAction.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/BuildProjectAction.java?rev=774565&r1=774564&r2=774565&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/BuildProjectAction.java (original)
+++ continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/BuildProjectAction.java Wed May 13 22:23:46 2009
@@ -103,6 +103,10 @@
event.setResource( "Project Group id=" + projectGroupId );
event.setCategory( AuditLogConstants.PROJECT_GROUP );
event.log();
+ if ( fromGroupPage )
+ {
+ return "to_group_page";
+ }
}
return SUCCESS;
Modified: continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/buildDefinitionGroupSummaryComponent.jsp
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/buildDefinitionGroupSummaryComponent.jsp?rev=774565&r1=774564&r2=774565&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/buildDefinitionGroupSummaryComponent.jsp (original)
+++ continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/buildDefinitionGroupSummaryComponent.jsp Wed May 13 22:23:46 2009
@@ -66,6 +66,7 @@
<s:url id="buildUrl" action="buildProject" namespace="/">
<s:param name="projectGroupId">${pageScope.buildDefinitionSummary.projectGroupId}</s:param>
<s:param name="buildDefinitionId">${pageScope.buildDefinitionSummary.id}</s:param>
+ <s:param name="fromGroupPage" value="true"/>
</s:url>
<s:a href="%{buildUrl}"><img src="<s:url value='/images/buildnow.gif' includeParams="none"/>" alt="<s:text name='build'/>" title="<s:text name='build'/>" border="0"></s:a>
</redback:ifAuthorized>