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/10 18:24:11 UTC
svn commit: r1242863 - in /archiva/trunk/archiva-modules:
archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/
archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/
archiva-web/archiva-web...
Author: olamy
Date: Fri Feb 10 17:24:11 2012
New Revision: 1242863
URL: http://svn.apache.org/viewvc?rev=1242863&view=rev
Log:
[MRM-1576] rewrite proxies connector page
fix update of properties.
Modified:
archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/AbstractRepositoryConnector.java
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
Modified: archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/AbstractRepositoryConnector.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/AbstractRepositoryConnector.java?rev=1242863&r1=1242862&r2=1242863&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/AbstractRepositoryConnector.java (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/AbstractRepositoryConnector.java Fri Feb 10 17:24:11 2012
@@ -393,7 +393,7 @@ public abstract class AbstractRepository
public void setPropertiesEntries( List<PropertyEntry> propertiesEntries )
{
- for ( PropertyEntry propertyEntry : policiesEntries )
+ for ( PropertyEntry propertyEntry : propertiesEntries )
{
addProperty( propertyEntry.getKey(), propertyEntry.getValue() );
}
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=1242863&r1=1242862&r2=1242863&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 Fri Feb 10 17:24:11 2012
@@ -88,27 +88,6 @@ $(function() {
this.modified=ko.observable(false);
this.modified.subscribe(function(newValue){$.log("ProxyConnector modified:"+newValue)});
-
- this.deleteProperty=function(key){
- $.log("delete property key:"+key());
- for(i=0;i<self.propertiesEntries().length;i++){
- var entry=self.propertiesEntries()[i];
- if (entry.key()==key()){
- self.propertiesEntries.remove(entry);
- }
- }
-
- }
-
- this.addProperty=function(){
- var mainContent=$("#main-content");
- var key=mainContent.find("#property-key").val();
- var value=mainContent.find("#property-value").val();
- var oldTab = self.propertiesEntries();
- oldTab.push(new Entry(key,value));
- self.propertiesEntries(oldTab);
- }
-
this.updatePolicyEntry=function(key,value){
for(i=0;i<policiesEntries.length;i++){
if (policiesEntries[i].key==key){
@@ -116,6 +95,7 @@ $(function() {
}
}
}
+
}
PolicyInformation=function(options,defaultOption,id,name){
@@ -249,6 +229,28 @@ $(function() {
}
}
+ this.deleteProperty=function(key){
+ $.log("delete property key:"+key());
+ for(i=0;i<self.proxyConnector.propertiesEntries().length;i++){
+ var entry=self.proxyConnector.propertiesEntries()[i];
+ if (entry.key()==key()){
+ self.proxyConnector.propertiesEntries.remove(entry);
+ }
+ }
+
+ }
+
+ this.addProperty=function(){
+ var mainContent=$("#main-content");
+ var key=mainContent.find("#property-key").val();
+ var value=mainContent.find("#property-value").val();
+ var oldTab = self.proxyConnector.propertiesEntries();
+ oldTab.push(new Entry(key,value));
+ self.proxyConnector.propertiesEntries(oldTab);
+ mainContent.find("#property-key").val("");
+ mainContent.find("#property-value").val("");
+ }
+
displayGrid=function(){
activateProxyConnectorsGridTab();
}
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=1242863&r1=1242862&r2=1242863&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 Fri Feb 10 17:24:11 2012
@@ -163,13 +163,13 @@
<thead>
<th><input type="text" id="property-key"/></th>
<th><input type="text" id="property-value"/></th>
- <th><a href="#" data-bind="click: function(){ proxyConnector.addProperty() }">${$.i18n.prop('add')}</a></th>
+ <th><a href="#" data-bind="click: function(){ addProperty() }">${$.i18n.prop('add')}</a></th>
</thead>
<tbody data-bind="foreach: proxyConnector.propertiesEntries">
<tr>
<td data-bind="text: key"></td>
<td data-bind="text: value"></td>
- <td><a href="#" data-bind="click: function(){$data.deleteProperty(key)}">${$.i18n.prop('delete')}</a></td>
+ <td><a href="#" data-bind="click: function(){ $parent.deleteProperty(key)}">${$.i18n.prop('delete')}</a></td>
</tr>
</tbody>
</table>