Author: oching
Date: Wed Jun 3 11:15:09 2009
New Revision: 781339
URL: http://svn.apache.org/viewvc?rev=781339&view=rev
Log:
[MRM-1168]
submitted by Jevica Arianne Zurbano
o add info message for account locked
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/SearchAction.java
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/resources/struts.xml
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/SearchAction.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/SearchAction.java?rev=781339&r1=781338&r2=781339&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/SearchAction.java
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/SearchAction.java
Wed Jun 3 11:15:09 2009
@@ -124,6 +124,8 @@
private RepositorySearch nexusSearch;
private Map<String, String> searchFields;
+
+ private String infoMessage;
public boolean isFromResultsPage()
{
@@ -659,4 +661,14 @@
{
this.searchFields = searchFields;
}
+
+ public String getInfoMessage()
+ {
+ return infoMessage;
+ }
+
+ public void setInfoMessage( String infoMessage )
+ {
+ this.infoMessage = infoMessage;
+ }
}
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/resources/struts.xml
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/resources/struts.xml?rev=781339&r1=781338&r2=781339&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/resources/struts.xml
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/resources/struts.xml
Wed Jun 3 11:15:09 2009
@@ -82,8 +82,8 @@
<result name="security-login-success"
type="redirect-action">index</result>
<result name="security-login-cancel"
type="redirect-action">index</result>
<result name="security-login-locked" type="redirect-action">
- <param name="infoMessage">Account Locked</param>
<param name="actionName">index</param>
+ <param name="infoMessage">Account Locked</param>
</result>
<result name="security-logout" type="redirect-action">index</result>
<result name="requires-authentication" type="redirect-action">
