merged from -r693737 (MRM-765: disabled the Add link if there are no remote repositories defined and inform the user that it is disabled)

1.1.x branch


git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@693741 13f79535-47bb-0310-9956-ffa450edef68

2 files changed, 28 insertions, 8 deletions

diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/connectors/proxy/ProxyConnectorsAction.java b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/connectors/proxy/ProxyConnectorsAction.java
index fccbd380e..3cfb0ece9 100644
--- a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/connectors/proxy/ProxyConnectorsAction.java
+++ b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/connectors/proxy/ProxyConnectorsAction.java
@@ -44,6 +44,11 @@ public class ProxyConnectorsAction
     private Map<String, AbstractRepositoryConfiguration> repoMap;
 
     /**
+     * boolean to indicate that remote repo is present. Used for Add Link
+     */
+    private boolean remoteRepoExists=false;
+    
+    /**
      * Map of Proxy Connectors.
      */
     private Map<String, List<ProxyConnectorConfiguration>> proxyConnectorMap;
@@ -57,6 +62,8 @@ public class ProxyConnectorsAction
         repoMap.putAll( config.getManagedRepositoriesAsMap() );
 
         proxyConnectorMap = createProxyConnectorMap();
+        
+        remoteRepoExists=config.getRemoteRepositories().size()>0;
     }
 
     public Map<String, AbstractRepositoryConfiguration> getRepoMap()
@@ -68,4 +75,9 @@ public class ProxyConnectorsAction
     {
         return proxyConnectorMap;
     }
+
+	public boolean getRemoteRepoExists()
+    {
+        return remoteRepoExists;
+    }
 }
diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/proxyConnectors.jsp b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/proxyConnectors.jsp
index b084a1d34..43a0b5da2 100644
--- a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/proxyConnectors.jsp
+++ b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/proxyConnectors.jsp
@@ -46,14 +46,22 @@
 <ww:actionerror/>
 <ww:actionmessage/>
 
-<div style="float:right">
-  <redback:ifAnyAuthorized permissions="archiva-manage-configuration">
-    <ww:url id="addProxyConnectorUrl" action="addProxyConnector"/>
-    <ww:a href="%{addProxyConnectorUrl}" cssClass="create">
-      <img src="<c:url value="/images/icons/create.png" />"/>
-      Add
-    </ww:a>
-  </redback:ifAnyAuthorized>
+<div style="float:right">  
+  <c:choose>
+	<c:when test="${remoteRepoExists}">
+	  <redback:ifAnyAuthorized permissions="archiva-manage-configuration">
+	    <ww:url id="addProxyConnectorUrl" action="addProxyConnector"/>
+	    <ww:a href="%{addProxyConnectorUrl}" cssClass="create">
+	      <img src="<c:url value="/images/icons/create.png" />"/>
+	      Add
+	    </ww:a>
+	  </redback:ifAnyAuthorized>
+	</c:when>
+	<c:otherwise>
+		<img src="<c:url value="/images/icons/create.png" />"/>
+	      Add (Disabled. No remote repositories)
+	</c:otherwise>
+  </c:choose>    
 </div>
 
 <h2>Repository Proxy Connectors</h2>