Author: olamy
Date: Wed Feb 8 23:56:50 2012
New Revision: 1242184
URL: http://svn.apache.org/viewvc?rev=1242184&view=rev
Log:
[MRM-1576] rewrite proxies connector page
white/black list pattern ui binding.
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/main/resources/org/apache/archiva/i18n/default.properties
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/proxy-connectors.js
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/proxy-connectors.html
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/utils.js
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/main/resources/org/apache/archiva/i18n/default.properties
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/main/resources/org/apache/archiva/i18n/default.properties?rev=1242184&r1=1242183&r2=1242184&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/main/resources/org/apache/archiva/i18n/default.properties
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/main/resources/org/apache/archiva/i18n/default.properties
Wed Feb 8 23:56:50 2012
@@ -138,4 +138,6 @@ proxy-connectors.grid.tab.title=Proxy Co
proxy-connectors.grid.managedrepo.grid.header=Managed Repositories
proxy-connectors.grid.remoterepo.title=Remote Repository
proxy-connectors.grid.managedrepo.title=Managed Repository
+proxy-connector.blacklist=Black List
+proxy-connector.whitelist=White List
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/proxy-connectors.js
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/proxy-connectors.js?rev=1242184&r1=1242183&r2=1242184&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/proxy-connectors.js
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/proxy-connectors.js
Wed Feb 8 23:56:50 2012
@@ -172,12 +172,33 @@ $(function() {
var mainContent=$("#main-content");
var key=mainContent.find("#property-key").val();
var value=mainContent.find("#property-value").val();
- $.log("add
property:"+key+":"+value+",size:"+self.proxyConnector.properties().length);
- var oldTab = proxyConnector.properties();
+ var oldTab = self.proxyConnector.properties();
oldTab.push(new Entry(key,value));
self.proxyConnector.properties(oldTab);
- $.log("add
property:"+key+":"+value+",size:"+self.proxyConnector.properties().length);
- self.proxyConnector.modified(true);
+ }
+
+ addBlacklistPattern=function(){
+ var pattern = $("#main-content #blacklist-value").val();
+ var tab = self.proxyConnector.blackListPatterns();
+ tab.push(pattern);
+ self.proxyConnector.blackListPatterns(tab);
+
+ }
+
+ removeBlacklistPattern=function(pattern){
+ self.proxyConnector.blackListPatterns.remove(pattern);
+ }
+
+ addWhitelistPattern=function(){
+ var pattern = $("#main-content #whitelist-value").val();
+ var tab = self.proxyConnector.whiteListPatterns();
+ tab.push(pattern);
+ self.proxyConnector.whiteListPatterns(tab);
+
+ }
+
+ removeWhitelistPattern=function(pattern){
+ self.proxyConnector.whiteListPatterns.remove(pattern);
}
}
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/proxy-connectors.html
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/proxy-connectors.html?rev=1242184&r1=1242183&r2=1242184&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/proxy-connectors.html
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/proxy-connectors.html
Wed Feb 8 23:56:50 2012
@@ -163,7 +163,6 @@
</table>
<table class="table">
-
<tbody data-bind="foreach: proxyConnector.properties">
<tr>
<td data-bind="text: key"></td>
@@ -172,8 +171,51 @@
</tr>
</tbody>
</table>
+ </div>
+
+ <div class="control-group span6">
+ <table>
+ <thead>
+ <th colspan="2"
class="pull-left">${$.i18n.prop('proxy-connector.blacklist')}</th>
+ </thead>
+ <tr>
+ <td><input type="text" id="blacklist-value"/></td>
+ <td><a href="#" data-bind="click: function(){
addBlacklistPattern() }">${$.i18n.prop('add')}</a></td>
+ </tr>
+ </table>
+
+ <table class="table">
+ <tbody data-bind="foreach: proxyConnector.blackListPatterns">
+ <tr>
+ <td data-bind="text: $data"></td>
+ <td><a href="#" data-bind="click:
function(){removeBlacklistPattern($data)}">${$.i18n.prop('delete')}</a></td>
+ </tr>
+ </tbody>
+ </table>
+ </div>
+
+
+ <div class="control-group span6">
+ <table>
+ <thead>
+ <th colspan="2"
class="pull-left">${$.i18n.prop('proxy-connector.whitelist')}</th>
+ </thead>
+ <tr>
+ <td><input type="text" id="whitelist-value"/></td>
+ <td><a href="#" data-bind="click: function(){
addWhitelistPattern() }">${$.i18n.prop('add')}</a></td>
+ </tr>
+ </table>
+ <table class="table">
+ <tbody data-bind="foreach: proxyConnector.whiteListPatterns">
+ <tr>
+ <td data-bind="text: $data"></td>
+ <td><a href="#" data-bind="click:
function(){removeWhitelistPattern($data)}">${$.i18n.prop('delete')}</a></td>
+ </tr>
+ </tbody>
+ </table>
</div>
+
</fieldset>
</form>
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/utils.js
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/utils.js?rev=1242184&r1=1242183&r2=1242184&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/utils.js
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/utils.js
Wed Feb 8 23:56:50 2012
@@ -315,7 +315,6 @@ Entry=function(key,value){
this.modified=ko.observable(false);
this.key=ko.observable(key);
this.key.subscribe(function(newValue){self.modified(true)});
-
this.value=ko.observable(value);
this.value.subscribe(function(newValue){self.modified(true)});
}
