You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@continuum.apache.org by ba...@apache.org on 2015/04/24 15:24:09 UTC
svn commit: r1675837 - in /continuum/trunk/continuum-webapp/src/main:
java/org/apache/maven/continuum/web/action/ProjectGroupAction.java
java/org/apache/maven/continuum/web/action/SummaryAction.java
resources/struts.xml
Author: batkinson
Date: Fri Apr 24 13:24:09 2015
New Revision: 1675837
URL: http://svn.apache.org/r1675837
Log:
Redirecting with stored messages no longer hides group project summary.
Modified:
continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ProjectGroupAction.java
continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/SummaryAction.java
continuum/trunk/continuum-webapp/src/main/resources/struts.xml
Modified: continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ProjectGroupAction.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ProjectGroupAction.java?rev=1675837&r1=1675836&r2=1675837&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ProjectGroupAction.java (original)
+++ continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ProjectGroupAction.java Fri Apr 24 13:24:09 2015
@@ -145,11 +145,10 @@ public class ProjectGroupAction
throws Exception
{
super.prepare();
-
repositories = getContinuum().getRepositoryService().getAllLocalRepositories();
}
- public String summary()
+ public String browse()
throws ContinuumException
{
try
@@ -284,13 +283,13 @@ public class ProjectGroupAction
public String buildDefinitions()
throws ContinuumException
{
- return summary();
+ return browse();
}
public String notifiers()
throws ContinuumException
{
- return summary();
+ return browse();
}
public String remove()
Modified: continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/SummaryAction.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/SummaryAction.java?rev=1675837&r1=1675836&r2=1675837&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/SummaryAction.java (original)
+++ continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/SummaryAction.java Fri Apr 24 13:24:09 2015
@@ -63,7 +63,7 @@ public class SummaryAction
@Requirement( hint = "parallel" )
private BuildsManager parallelBuildsManager;
- public String execute()
+ public String browse()
throws ContinuumException
{
try
Modified: continuum/trunk/continuum-webapp/src/main/resources/struts.xml
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/resources/struts.xml?rev=1675837&r1=1675836&r2=1675837&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/resources/struts.xml (original)
+++ continuum/trunk/continuum-webapp/src/main/resources/struts.xml Fri Apr 24 13:24:09 2015
@@ -395,7 +395,7 @@
<!--
* project group actions
-->
- <action name="projectGroupSummary" class="projectGroup" method="summary">
+ <action name="projectGroupSummary" class="projectGroup" method="browse">
<interceptor-ref name="retrieveStack"/>
<result name="success">/WEB-INF/jsp/projectGroupSummary.jsp</result>
<result name="to_summary_page" type="redirectAction">
@@ -1283,7 +1283,7 @@
<result name="error">/WEB-INF/jsp/components/failureComponent.jsp</result>
</action>
- <action name="projectSummary" class="summary">
+ <action name="projectSummary" class="summary" method="browse">
<result name="input">/WEB-INF/jsp/components/projectSummaryComponent.jsp</result>
<result name="success">/WEB-INF/jsp/components/projectSummaryComponent.jsp</result>
<result name="error">/WEB-INF/jsp/components/failureComponent.jsp</result>