svn commit: r1411244 - /archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/proxy-connectors-rules.js

[ol...@apache.org]

Author: olamy
Date: Mon Nov 19 15:23:03 2012
New Revision: 1411244

URL: http://svn.apache.org/viewvc?rev=1411244&view=rev
Log:
[MRM-1712] Add buttons for managing proxy connectors rules as can be a pain with long list of repositories.
fix handling of click after a drag&drop.

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=1411244&r1=1411243&r2=1411244&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 Mon Nov 19 15:23:03 2012
@@ -175,14 +175,10 @@ define("archiva.proxy-connectors-rules",
       proxyConnectorRuleViewModel.activateRemoveAvailable(self);
     }
 
-
-
     remove=function(){
       $.log("remove");
     }
 
-
-
   }
 
   ProxyConnectorRuleViewModel=function(proxyConnectorRule,proxyConnectorRulesViewModel,update){
@@ -195,7 +191,7 @@ define("archiva.proxy-connectors-rules",
 
 
     $.each(this.proxyConnectorRulesViewModel.proxyConnectors(), function(idx, value) {
-      $.log(idx + ': ' + value.sourceRepoId() +":"+value.targetRepoId());
+      //$.log(idx + ': ' + value.sourceRepoId() +":"+value.targetRepoId());
       var available=true;
       // is it in proxyConnectorRule.proxyConnectors
       $.each(self.proxyConnectorRule.proxyConnectors(),function(index,proxyConnector){
@@ -212,6 +208,7 @@ define("archiva.proxy-connectors-rules",
       $.log("repositoryMoved:"+arg.sourceIndex+" to " + arg.targetIndex);
       self.proxyConnectorRule.modified(true);
       self.activateRemoveChoosen(self.proxyConnectorRulesViewModel);
+      self.activateRemoveAvailable(self.proxyConnectorRulesViewModel);
     }
 
     saveProxyConnectorRule=function(){
@@ -233,6 +230,9 @@ define("archiva.proxy-connectors-rules",
       self.proxyConnectorRule.proxyConnectors.remove(proxyConnectorToRemove);
       self.availableProxyConnectors.push(proxyConnectorToRemove);
       $.log("size after:"+self.proxyConnectorRule.proxyConnectors().length);
+      $("#main-content" ).find("#proxy-connectors-rules-available-proxy-connectors" ).find("[data-source-repoId="+sourceRepoId+"][data-target-repoId="+targetRepoId+"]" ).on("click", function(){
+        self.removeAvailable(proxyConnectorRulesViewModel,$(this).attr("data-source-repoId"),$(this).attr("data-target-repoId"));
+      });
     }
 
     this.activateRemoveChoosen=function(proxyConnectorRulesViewModel){
@@ -255,7 +255,10 @@ define("archiva.proxy-connectors-rules",
       }
       self.proxyConnectorRule.proxyConnectors.push(proxyConnectorToAdd);
       self.availableProxyConnectors.remove(proxyConnectorToAdd);
-      $.log("size after:"+self.proxyConnectorRule.proxyConnectors().length);
+      $.log("size after:"+self.availableProxyConnectors().length);
+      $("#main-content" ).find("#proxy-connectors-rules-edit-order-div" ).find("[data-source-repoId="+sourceRepoId+"][data-target-repoId="+targetRepoId+"]" ).on("click", function(){
+        self.removeChoosen(proxyConnectorRulesViewModel,$(this).attr("data-source-repoId"),$(this).attr("data-target-repoId"));
+      });
     }
 
     this.activateRemoveAvailable=function(proxyConnectorRulesViewModel){