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/01/31 15:40:58 UTC
svn commit: r1238622 - in
/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva:
network-proxies.js templates/network-proxies.html
Author: olamy
Date: Tue Jan 31 14:40:57 2012
New Revision: 1238622
URL: http://svn.apache.org/viewvc?rev=1238622&view=rev
Log:
add a bulk update mode. Users can update more than one network proxy and save all at the end
BTW to do for other screens :-)
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/network-proxies.js
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/network-proxies.html
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/network-proxies.js
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/network-proxies.js?rev=1238622&r1=1238621&r2=1238622&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/network-proxies.js (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/network-proxies.js Tue Jan 31 14:40:57 2012
@@ -48,17 +48,20 @@ $(function() {
this.modified=ko.observable(false);
}
- NetworkProxyViewModel=function(networkProxy, update, networkProxiesViewModel){
+ NetworkProxyViewModel=function(networkProxy, update, networkProxiesViewModel,bulkMode){
this.update=update;
this.networkProxy=networkProxy;
this.networkProxiesViewModel=networkProxiesViewModel;
var self=this;
+ this.bulkMode=false || bulkMode;
this.save=function(){
if (!$("#main-content #network-proxy-edit-form").valid()){
return;
}
- clearUserMessages();
+ if (!this.bulkMode){
+ clearUserMessages();
+ }
if (update){
$.ajax("restServices/archivaServices/networkProxyService/updateNetworkProxy",
{
@@ -69,7 +72,9 @@ $(function() {
success: function(data) {
displaySuccessMessage($.i18n.prop('networkproxy.updated',self.networkProxy.id()));
self.networkProxy.modified(false);
- activateNetworkProxiesGridTab();
+ if (!this.bulkMode){
+ activateNetworkProxiesGridTab();
+ }
},
error: function(data) {
var res = $.parseJSON(data.responseText);
@@ -121,8 +126,29 @@ $(function() {
activateNetworkProxyEditTab();
}
+ this.bulkSave=function(){
+ return getModifiedNetworkProxies().length>0;
+ }
+
+ getModifiedNetworkProxies=function(){
+ var prx = $.grep(self.networkProxies(),
+ function (networkProxy,i) {
+ $.log("networkProxy.modified():"+networkProxy.modified())
+ return networkProxy.modified();
+ });
+ return prx;
+ }
+
+ updateNetworkProxies=function(){
+ var modifiedNetworkProxies = getModifiedNetworkProxies();
+ for(i=0;i<modifiedNetworkProxies.length;i++){
+ var viewModel = new NetworkProxyViewModel(modifiedNetworkProxies[i],true,self,false);
+ viewModel.save();
+ }
+ }
+
updateNetworkProxy=function(networkProxy){
- var viewModel = new NetworkProxyViewModel(networkProxy,true,self);
+ var viewModel = new NetworkProxyViewModel(networkProxy,true,self,false);
viewModel.save();
}
@@ -210,6 +236,7 @@ $(function() {
}
});
ko.applyBindings(networkProxiesViewModel,$("#main-content #networkProxiesTable").get(0));
+ ko.applyBindings(networkProxiesViewModel,$("#main-content #network-proxies-bulk-save-btn").get(0));
}
}
);
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/network-proxies.html
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/network-proxies.html?rev=1238622&r1=1238621&r2=1238622&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/network-proxies.html (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/network-proxies.html Tue Jan 31 14:40:57 2012
@@ -31,6 +31,7 @@
</ul>
<div id="network-proxies-view-tabs-content" class="tab-content">
<div id="network-proxies-view" class="active">
+ <div id="network-proxies-bulk-save-btn" data-bind='template:{name:"network-proxies-bulk-save-tmpl"}'></div>
<table class="bordered-table zebra-striped" id="networkProxiesTable"
data-bind="simpleGrid: gridViewModel,simpleGridTemplate:'ko-network-proxies-grid',pageLinksId:'network-proxiesPagination'">
</table>
@@ -143,4 +144,10 @@
<button data-bind="click: save" class="btn">${$.i18n.prop('save')}</button>
<button data-bind="click: displayGrid" class="btn">${$.i18n.prop('cancel')}</button>
</form>
+</script>
+
+<script id="network-proxies-bulk-save-tmpl" type='text/x-jquery-tmpl'>
+ {{if bulkSave()}}
+ <button data-bind="click: updateNetworkProxies" class="btn">${$.i18n.prop('save.all')}</button>
+ {{/if}}
</script>
\ No newline at end of file