Author: jmcconnell
Date: Thu May 24 08:45:32 2007
New Revision: 541334
URL: http://svn.apache.org/viewvc?view=rev&rev=541334
Log:
[MRM-351] ability to turn on and off the Find Artifacts item on the left menu
bar. it is defaulting to false right now.
Modified:
maven/archiva/trunk/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/interceptor/ConfigurationInterceptor.java
maven/archiva/trunk/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/decorators/default.jsp
Modified:
maven/archiva/trunk/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/interceptor/ConfigurationInterceptor.java
URL:
http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/interceptor/ConfigurationInterceptor.java?view=diff&rev=541334&r1=541333&r2=541334
==============================================================================
---
maven/archiva/trunk/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/interceptor/ConfigurationInterceptor.java
(original)
+++
maven/archiva/trunk/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/interceptor/ConfigurationInterceptor.java
Thu May 24 08:45:32 2007
@@ -19,9 +19,11 @@
* under the License.
*/
+import com.opensymphony.webwork.ServletActionContext;
import com.opensymphony.xwork.ActionInvocation;
import com.opensymphony.xwork.interceptor.Interceptor;
+import org.apache.maven.archiva.configuration.ArchivaConfiguration;
import org.apache.maven.archiva.database.ArchivaDAO;
import org.apache.maven.archiva.model.ArchivaRepository;
import org.codehaus.plexus.logging.AbstractLogEnabled;
@@ -29,8 +31,10 @@
import java.util.Iterator;
import java.util.List;
+import javax.servlet.http.HttpSession;
+
/**
- * An interceptor that makes the application configuration available
+ * An interceptor that makes the configuration bits available, both to the
application and the webapp
*
* @author <a href="mailto:[EMAIL PROTECTED]">Brett Porter</a>
* @plexus.component role="com.opensymphony.xwork.interceptor.Interceptor"
@@ -45,6 +49,11 @@
*/
private ArchivaDAO dao;
+ /**
+ * @plexus.requirement role-hint="default"
+ */
+ private ArchivaConfiguration configuration;
+
/**
* @param actionInvocation
* @return
@@ -53,6 +62,13 @@
public String intercept( ActionInvocation actionInvocation )
throws Exception
{
+ // populate webapp configuration bits into the session
+ HttpSession session = ServletActionContext.getRequest().getSession();
+ if ( session != null )
+ {
+ session.setAttribute( "uiOptions",
configuration.getConfiguration().getWebapp().getUi() );
+ }
+
List repos = dao.getRepositoryDAO().getRepositories();
if ( !hasManagedRepository( repos ) )
Modified:
maven/archiva/trunk/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/decorators/default.jsp
URL:
http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/decorators/default.jsp?view=diff&rev=541334&r1=541333&r2=541334
==============================================================================
---
maven/archiva/trunk/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/decorators/default.jsp
(original)
+++
maven/archiva/trunk/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/decorators/default.jsp
Thu May 24 08:45:32 2007
@@ -83,10 +83,12 @@
<li class="none">
<my:currentWWUrl action="index" namespace="/">Search</my:currentWWUrl>
</li>
-
- <li class="none">
- <my:currentWWUrl action="findArtifact" namespace="/">Find
Artifact</my:currentWWUrl>
- </li>
+
+ <ww:if test="${sessionScope.uiOptions.showFindArtifacts}">
+ <li class="none">
+ <my:currentWWUrl action="findArtifact" namespace="/">Find
Artifact</my:currentWWUrl>
+ </li>
+ </ww:if>
<li class="none">
<my:currentWWUrl action="browse" namespace="/">Browse</my:currentWWUrl>
