svn commit: r1238092 - 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/

[ol...@apache.org]

Author: olamy
Date: Mon Jan 30 23:48:53 2012
New Revision: 1238092

URL: http://svn.apache.org/viewvc?rev=1238092&view=rev
Log:
add subscribers to mark modified lines when users doesn't save immediatly.

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/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-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=1238092&r1=1238091&r2=1238092&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 Mon Jan 30 23:48:53 2012
@@ -24,6 +24,14 @@
 id=id
 warning.not.undone.operation=WARNING: This operation can not be undone.
 none=none
+ok=ok
+add=Add
+host=Host
+port=Port
+protocol=Protocol
+id.required.or.alreadyexists=Id required or already exists
+modified=Modified
+save=Save
 
 managedrepository.delete.content=Delete Content too ?
 

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=1238092&r1=1238091&r2=1238092&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 Mon Jan 30 23:48:53 2012
@@ -20,23 +20,32 @@ $(function() {
 
 
   NetworkProxy=function(id,protocol,host,port,username,password){
+    var self=this;
     //private String id;
     this.id = ko.observable(id);
+    this.id.subscribe(function(newValue){self.modified(true)});
 
     //private String protocol = "http";
     this.protocol=ko.observable(protocol);
+    this.protocol.subscribe(function(newValue){self.modified(true)});;
 
     //private String host;
     this.host=ko.observable(host);
+    this.host.subscribe(function(newValue){self.modified(true)});;
 
     //private int port = 8080;
     this.port=ko.observable(port);
+    this.port.subscribe(function(newValue){self.modified(true)});;
 
     //private String username;
     this.username=ko.observable(username?username:"");
+    this.username.subscribe(function(newValue){self.modified(true)});;
 
     //private String password;
     this.password=ko.observable(password?password:"");
+    this.password.subscribe(function(newValue){self.modified(true)});;
+
+    this.modified=ko.observable(false);
   }
 
   NetworkProxyViewModel=function(networkProxy, update, networkProxiesViewModel){
@@ -45,7 +54,7 @@ $(function() {
     this.networkProxiesViewModel=networkProxiesViewModel;
     var self=this;
 
-    save=function(){
+    this.save=function(){
       if (!$("#main-content #network-proxy-edit-form").valid()){
         return;
       }
@@ -59,6 +68,7 @@ $(function() {
             dataType: 'json',
             success: function(data) {
               displaySuccessMessage($.i18n.prop('networkproxy.updated'));
+              self.networkProxy.modified(false);
               activateNetworkProxiesGridTab();
             },
             error: function(data) {
@@ -96,7 +106,7 @@ $(function() {
   }
 
   NetworkProxiesViewModel=function(){
-    this.networkProxies=ko.observableArray([]);
+    this.networkProxies=ko.observableArray([]);//.subscribe(function(val){$.log('subscribe')});
 
     var self=this;
 
@@ -111,6 +121,11 @@ $(function() {
       activateNetworkProxyEditTab();
     }
 
+    updateNetworkProxy=function(networkProxy){
+      var viewModel = new NetworkProxyViewModel(networkProxy,true,self);
+      viewModel.save();
+    }
+
     removeNetworkProxy=function(networkProxy){
       openDialogConfirm(
           function(){$.ajax("restServices/archivaServices/networkProxyService/deleteNetworkProxy/"+encodeURIComponent(networkProxy.id()),
@@ -162,6 +177,7 @@ $(function() {
         dataType: 'json',
         success: function(data) {
           networkProxiesViewModel.networkProxies(mapNetworkProxies(data));
+          //networkProxiesViewModel.networkProxies.subscribe(function(){$.log("change in networkProxies")});
           networkProxiesViewModel.gridViewModel = new ko.simpleGrid.viewModel({
             data: networkProxiesViewModel.networkProxies,
             columns: [

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=1238092&r1=1238091&r2=1238092&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 Mon Jan 30 23:48:53 2012
@@ -50,6 +50,7 @@
         <th>${$.i18n.prop('password')}</th>
         <th>${$.i18n.prop('edit')}</th>
         <th>${$.i18n.prop('delete')}</th>
+        <th>${$.i18n.prop('modified')}</th>
     </tr>
     </thead>
     <tbody>
@@ -75,6 +76,12 @@
               <img src="images/edit-cut.png" title="${$.i18n.prop('delete')}"/>
             </a>
         </td>
+        {{if row.modified()}}
+          <td><a href="#" data-bind="click: function(){ updateNetworkProxy(row) }">${$.i18n.prop('save')}</a></td>
+        {{else}}
+          <td></td>
+        {{/if}}
+
     </tr>
     {{/each}}
     </tbody>