Author: olamy
Date: Tue Oct 16 22:44:28 2012
New Revision: 1399030
URL: http://svn.apache.org/viewvc?rev=1399030&view=rev
Log:
fix available proxy connectors in proxy connectors screen
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/proxy-connectors-rules.js
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/proxy-connectors-rules.js
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/proxy-connectors-rules.js?rev=1399030&r1=1399029&r2=1399030&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/proxy-connectors-rules.js
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/proxy-connectors-rules.js
Tue Oct 16 22:44:28 2012
@@ -175,10 +175,25 @@ define("archiva.proxy-connectors-rules",
var self=this;
this.proxyConnectorRule=proxyConnectorRule;
this.proxyConnectorRulesViewModel=proxyConnectorRulesViewModel;
- this.availableProxyConnectors=proxyConnectorRulesViewModel.proxyConnectors;
+ this.availableProxyConnectors=ko.observableArray([]);
this.availableProxyConnectors.id="availableProxyConnectors";
this.update=update;
+
+ $.each(this.proxyConnectorRulesViewModel.proxyConnectors(),
function(idx, value) {
+ $.log(idx + ': ' + value.sourceRepoId() +":"+value.targetRepoId());
+ var available=true;
+ // is it in proxyConnectorRule.proxyConnectors
+
$.each(self.proxyConnectorRule.proxyConnectors(),function(index,proxyConnector){
+ if(value.sourceRepoId()==proxyConnector.sourceRepoId() &&
value.targetRepoId()==proxyConnector.targetRepoId()){
+ available=false;
+ }
+ });
+ if(available==true){
+ self.availableProxyConnectors.push(value);
+ }
+ });
+
proxyConnectorMoved=function(arg){
$.log("repositoryMoved:"+arg.sourceIndex+" to " + arg.targetIndex);
self.proxyConnectorRule.modified(true);