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:23:36 UTC
svn commit: r1242861 - in /archiva/trunk/archiva-modules/archiva-web:
archiva-web-common/src/main/resources/org/apache/archiva/i18n/
archiva-webapp-js/src/main/webapp/js/archiva/
archiva-webapp-js/src/main/webapp/js/archiva/templates/
Author: olamy
Date: Fri Feb 10 17:23:36 2012
New Revision: 1242861
URL: http://svn.apache.org/viewvc?rev=1242861&view=rev
Log:
[MRM-1576] rewrite proxies connector page
add edition too.
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
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=1242861&r1=1242860&r2=1242861&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 Fri Feb 10 17:23:36 2012
@@ -138,6 +138,7 @@ proxy-connector.blacklist=Black List
proxy-connector.whitelist=White List
proxyconnector.removed=ProxyConnector removed.
proxyconnector.added=ProxyConnector added.
+proxyconnector.updated=ProxyConnector updated.
proxy-connectors.grid.remoterepo.settings.popover.title=Proxy Connector Settings
proxy-connectors.remoterepo.settings.networkproxy=Network Proxy
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=1242861&r1=1242860&r2=1242861&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:23:36 2012
@@ -138,6 +138,7 @@ $(function() {
this.proxyConnectorsViewModel=proxyConnectorsViewModel;
this.update=update;
this.modified=ko.observable(false);
+
getSelectedPolicyOption=function(id){
$.log("getSelectedPolicyOption:"+id);
@@ -145,8 +146,9 @@ $(function() {
$.log("getSelectedPolicyOption policies.length:"+policiesEntries.length);
if (policiesEntries!=null){
for (i=0;i<policiesEntries.length;i++){
- if (id==policiesEntries[i].key()){
- return policiesEntries[i].value();
+ var curKey = $.isFunction(policiesEntries[i].key)? policiesEntries[i].key():policiesEntries[i].key;
+ if (id==curKey){
+ return $.isFunction(policiesEntries[i].value)? policiesEntries[i].value():policiesEntries[i].value;
}
}
}
@@ -190,11 +192,26 @@ $(function() {
save=function(){
//FIXME data controls !!!
clearUserMessages();
+ // update is delete then add
if (this.update){
-
+ $.ajax("restServices/archivaServices/proxyConnectorService/updateProxyConnector",
+ {
+ type: "POST",
+ data: "{\"proxyConnector\": " + ko.toJSON(self.proxyConnector)+"}",
+ contentType: 'application/json',
+ dataType: 'json',
+ success: function(data) {
+ displaySuccessMessage($.i18n.prop('proxyconnector.updated'));
+ activateProxyConnectorsGridTab();
+ self.proxyConnector.modified(false);
+ },
+ error: function(data) {
+ var res = $.parseJSON(data.responseText);
+ displayRestError(res);
+ }
+ }
+ );
} else {
- var json = $.toJSON(ko.toJS(self.proxyConnector));
- $.log("toJSON:"+json);
$.ajax("restServices/archivaServices/proxyConnectorService/addProxyConnector",
{
@@ -214,7 +231,6 @@ $(function() {
}
}
);
-
}
}
@@ -231,29 +247,21 @@ $(function() {
this.remoteRepositories=ko.observableArray([]);
this.networkProxies=ko.observableArray([]);
- editProxyConnector=function(managedRepositoryConnectorView){
- $.log("editProxyConnector");
+ editProxyConnector=function(proxyConnector){
+ var proxyConnectorViewModel=new ProxyConnectorViewModel(proxyConnector,true,self);
+ var mainContent = $("#main-content");
+ mainContent.find("#proxy-connectors-edit").html($("#proxy-connector-edit-form-tmpl").tmpl());
+ ko.applyBindings(proxyConnectorViewModel,mainContent.find("#proxy-connectors-edit").get(0));
+ activateProxyConnectorsEditTab();
}
deleteProxyConnector=function(proxyConnector){
clearUserMessages();
- var url="restServices/archivaServices/proxyConnectorService/removeProxyConnector?";
- url += "sourceRepoId="+encodeURIComponent(proxyConnector.sourceRepoId());
- url += "&targetRepoId="+encodeURIComponent(proxyConnector.targetRepoId());
- $.ajax(url,
- {
- type: "GET",
- contentType: 'application/json',
- success: function(data) {
- displaySuccessMessage($.i18n.prop('proxyconnector.removed'));
- self.proxyConnectors.remove(proxyConnector);
- self.displayGrid();
- },
- error: function(data) {
- var res = $.parseJSON(data.responseText);
- displayRestError(res);
- }
- }
- );
+ removeProxyConnector(proxyConnector,function(){
+ displaySuccessMessage($.i18n.prop('proxyconnector.removed'));
+ self.proxyConnectors.remove(proxyConnector);
+ //self.displayGrid();
+ });
+
}
@@ -463,4 +471,25 @@ $(function() {
});
}
+ removeProxyConnector=function(proxyConnector,fnSuccessCallback){
+ clearUserMessages();
+ var url="restServices/archivaServices/proxyConnectorService/removeProxyConnector?";
+ url += "sourceRepoId="+encodeURIComponent(proxyConnector.sourceRepoId());
+ url += "&targetRepoId="+encodeURIComponent(proxyConnector.targetRepoId());
+ $.ajax(url,
+ {
+ type: "GET",
+ contentType: 'application/json',
+ success: function(data) {
+ fnSuccessCallback();
+ },
+ error: function(data) {
+ var res = $.parseJSON(data.responseText);
+ displayRestError(res);
+ }
+ }
+ );
+
+ }
+
});
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=1242861&r1=1242860&r2=1242861&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:23:36 2012
@@ -98,11 +98,7 @@
{{each(i, entry) policiesEntries}}
<tr>
<td>${entry.key}</td>
- {{if $.isFunction( entry.value ) }}
- <td>function=====${entry.value()}</td>
- {{else}}
- <td>${entry.value}</td>
- {{/if}}
+ <td>${entry.value}</td>
</tr>
{{/each}}
</tbody>