From: Olivier Lamy <olamy@apache.org>
Date: Wed, 3 Oct 2012 06:38:53 +0000 (+0000)
Subject: documentation for proxy connector rules screen
X-Git-Tag: archiva-1.4-M3~13
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=1ae62e4437bbcb4555bc67bb7f47d1af1d8e8c67;p=archiva.git

documentation for proxy connector rules screen

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

diff --git a/archiva-docs/src/site/apt/adminguide/configuration.apt b/archiva-docs/src/site/apt/adminguide/configuration.apt
index 7a4438a1c..65a20b76d 100644
--- a/archiva-docs/src/site/apt/adminguide/configuration.apt
+++ b/archiva-docs/src/site/apt/adminguide/configuration.apt
@@ -34,6 +34,8 @@ Runtime Configuration of Apache Archiva
 
     * {{{./network-proxies.html} Configuring network proxies}}
 
+    * {{{./proxy-connector-rules.html} Configuring proxy connectors rules}}
+
     * {{{./network-configuration.html} Network Configuration}}
 
     * {{{./legacy.html} Configuring legacy (maven 1) support}}
diff --git a/archiva-docs/src/site/site.xml b/archiva-docs/src/site/site.xml
index a874925ff..96a12e62f 100644
--- a/archiva-docs/src/site/site.xml
+++ b/archiva-docs/src/site/site.xml
@@ -101,6 +101,7 @@
       <item name="Runtime Configuration"      href="/adminguide/configuration.html" collapse="true">
         <item name="Repositories"             href="/adminguide/repositories.html" />
         <item name="Proxy Connectors"         href="/adminguide/proxy-connectors.html" />
+        <item name="Proxy Connectors Rules"   href="/adminguide/proxy-connector-rules.html"/>
         <item name="Network Proxies"          href="/adminguide/network-proxies.html" />
         <item name="Network Configuration"    href="/adminguide/network-configuration.html" />
         <item name="Legacy (Maven 1) Support" href="/adminguide/legacy.html" />
diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/repositories.html b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/repositories.html
index 6278fa5f1..86dbd3688 100644
--- a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/repositories.html
+++ b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/repositories.html
@@ -1331,7 +1331,7 @@
         <blockquote>
           ${proxyConnectorRule.pattern()}
           <br/>
-          ${proxyConnectorRule.proxyConnectorRuleType()}
+          ${proxyConnectorRule.ruleType.label}
         </blockquote>
       </div>
     {{else}}