You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by ol...@apache.org on 2012/02/08 18:44:06 UTC
svn commit: r1242006 -
/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/proxy-connectors.js
Author: olamy
Date: Wed Feb 8 17:44:06 2012
New Revision: 1242006
URL: http://svn.apache.org/viewvc?rev=1242006&view=rev
Log:
[MRM-1576] rewrite proxies connector page
fix selection of defaultOption in add mode as no policies exists.
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/proxy-connectors.js
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=1242006&r1=1242005&r2=1242006&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 17:44:06 2012
@@ -101,10 +101,21 @@ $(function() {
this.proxyConnectorsViewModel=proxyConnectorsViewModel;
this.update=update;
getSelectedPolicyOption=function(id){
+ if (!update){
+ // we are on add mode so use default option
+ var policyInformations=self.proxyConnectorsViewModel.policyInformations();
+ for (i=0;i<policyInformations.length;i++){
+ if (policyInformations[i].id()==id) {
+ return policyInformations[i].defaultOption;
+ }
+ }
+ }
var policies=self.proxyConnector().policies();
- for (i=0;i<policies().length;i++){
- if (id==policies()[i].key()){
- return policies()[i].value();
+ if (policies!=null){
+ for (i=0;i<policies().length;i++){
+ if (id==policies()[i].key()){
+ return policies()[i].value();
+ }
}
}
return "";