1 files changed, 10 insertions, 7 deletions

diff --git a/frontend/beta/js/Clipperz/PM/DataModel/User.js b/frontend/beta/js/Clipperz/PM/DataModel/User.js
index dbbe9a0..b065557 100644
--- a/frontend/beta/js/Clipperz/PM/DataModel/User.js
+++ b/frontend/beta/js/Clipperz/PM/DataModel/User.js
@@ -264,56 +264,56 @@ MochiKit.Logging.logError("- User.errorHandler: " + anErrorString + " (" + anExc
                 this.records()[aValue.reference()] = aValue;
                 
                 if (isBatchUpdate != true) {
                         Clipperz.NotificationCenter.notify(aValue, 'recordAdded', null, true);
                         Clipperz.NotificationCenter.notify(this, 'updatedSection', 'records', true);
                 }
         },
 
         //-----------------------------------------------------------------------------
 
         'addNewRecord': function() {
                         varrecord;
                 
 //MochiKit.Logging.logDebug(">>> User.addNewRecord");
                 record = new Clipperz.PM.DataModel.Record({user:this});
                 this.addRecord(record);
                 Clipperz.NotificationCenter.notify(this, 'updatedSection', 'records', true);
 //MochiKit.Logging.logDebug("<<< User.addNewRecord");
 
                 return record;
         },
 
         //-------------------------------------------------------------------------
 
-        'saveRecords': function(someRecords, aMethodName) {
+        'saveRecords': function(someRecords /*, aMethodName*/) {
                 var deferredResult;
-                var methodName;
+        //      var methodName;
                         varresult;
                 var i,c;
 
 //console.log("User.saveRecords - someRecords", someRecords);
-                methodName = aMethodName || 'addNewRecords';
+        //      methodName = aMethodName || 'addNewRecords';
                 
                 Clipperz.NotificationCenter.notify(this, 'updatedSection', 'records', true);
 //MochiKit.Logging.logDebug(">>> User.saveRecords");
 //MochiKit.Logging.logDebug(">>> [" + (new Date()).valueOf() + "] User.saveRecords");
 /*
 MochiKit.Logging.logDebug("--- User.saveRecords - 1");
                 MochiKit.Iter.forEach(someRecords, function(aRecord) {
                         if (aRecord.headerNotes() != null) {
                                 aRecord.setNotes(aRecord.headerNotes());
                         }
                         aRecord.syncDirectLoginReferenceValues();
                         aRecord.currentVersion().createNewVersion();
                         aRecord.updateKey();
                 });
 MochiKit.Logging.logDebug("--- User.saveRecords - 2");
 */
 
                 result = {'records': []};
                 
                 deferredResult = new MochiKit.Async.Deferred();
                 c = someRecords.length;
                 for (i=0; i<c; i++) {
                         deferredResult.addCallback(function(aRecord) {
                                 if (aRecord.headerNotes() != null) {
@@ -346,58 +346,59 @@ MochiKit.Logging.logDebug("--- User.saveRecords - 2");
                         recordData = {};
                         
 //deferredResult.addBoth(function(res) {MochiKit.Logging.logDebug("User.saveRecords - 6.1 " + res); return res;});
                         deferredResult.addCallback(Clipperz.NotificationCenter.deferredNotification, this, 'updatedProgressState', 'saveCard_encryptRecordData');
 //deferredResult.addBoth(function(res) {MochiKit.Logging.logDebug("User.saveRecords - 6.2 " + res); return res;});
                         deferredResult.addCallback(MochiKit.Base.method(someRecords[i], 'encryptedData'));
 //deferredResult.addBoth(function(res) {MochiKit.Logging.logDebug("User.saveRecords - 6.3 " + res); return res;});
                         deferredResult.addCallback(function(aResult, res) {
                                 aResult['record'] = res;
                                 return aResult;
                         }, recordData);
 //deferredResult.addBoth(function(res) {MochiKit.Logging.logDebug("User.saveRecords - 6.4 " + res); return res;});
 
                         deferredResult.addCallback(Clipperz.NotificationCenter.deferredNotification, this, 'updatedProgressState', {} /*'saveCard_encryptRecordVersions'*/);
 //deferredResult.addBoth(function(res) {MochiKit.Logging.logDebug("User.saveRecords - 6.5 " + res); return res;});
                         deferredResult.addCallback(MochiKit.Base.method(someRecords[i].currentVersion(), 'encryptedData'));
 //deferredResult.addBoth(function(res) {MochiKit.Logging.logDebug("User.saveRecords - 6.6 " + res); return res;});
                         deferredResult.addCallback(function(aResult, res) {
                                 aResult['currentRecordVersion'] = res;
                                 return aResult;
                         }, recordData);
 //deferredResult.addBoth(function(res) {MochiKit.Logging.logDebug("User.saveRecords - 6.7 " + res); return res;});
 
                         deferredResult.addCallback(function(aResult, res) {
-                                aResult['records'].push(res);
+                                aResult['records'] = { 'updated': [res] };
                                 return aResult;
                         }, result);
 //deferredResult.addBoth(function(res) {MochiKit.Logging.logDebug("User.saveRecords - 6.8 " + res); return res;});
                 }
 
 //deferredResult.addBoth(function(res) {MochiKit.Logging.logDebug("User.saveRecords - 7 " + res); return res;});
                 deferredResult.addCallback(Clipperz.NotificationCenter.deferredNotification, this, 'updatedProgressState', 'saveCard_sendingData');
 //deferredResult.addBoth(function(res) {MochiKit.Logging.logDebug("User.saveRecords - 8 " + res); return res;});
-                deferredResult.addCallback(MochiKit.Base.method(this.connection(), 'message'), methodName);
+        //      deferredResult.addCallback(MochiKit.Base.method(this.connection(), 'message'), methodName);
+                deferredResult.addCallback(MochiKit.Base.method(this.connection(), 'message'), 'saveChanges');
 //deferredResult.addBoth(function(res) {MochiKit.Logging.logDebug("User.saveRecords - 9 " + res); return res;});
 
                 for (i=0; i<c; i++) {
 //deferredResult.addBoth(function(res) {MochiKit.Logging.logDebug("User.saveRecords - 9.1 " + res); return res;});
                         deferredResult.addCallback(MochiKit.Base.method(someRecords[i], 'takeSnapshotOfCurrentData'));
 //deferredResult.addBoth(function(res) {MochiKit.Logging.logDebug("User.saveRecords - 9.2 " + res); return res;});
                         deferredResult.addCallback(MochiKit.Base.method(someRecords[i], 'setIsBrandNew'), false);
 //deferredResult.addBoth(function(res) {MochiKit.Logging.logDebug("User.saveRecords - 9.3 " + res); return res;});
                 }
                 
 //deferredResult.addBoth(function(res) {MochiKit.Logging.logDebug("User.saveRecords - 10 " + res); return res;});
                 deferredResult.addCallback(Clipperz.NotificationCenter.deferredNotification, this, 'notify', 'recordUpdated');
 //deferredResult.addBoth(function(res) {MochiKit.Logging.logDebug("User.saveRecords - 11 " + res); return res;});
                 deferredResult.addCallback(Clipperz.NotificationCenter.deferredNotification, this, 'notify', 'directLoginUpdated');
 //deferredResult.addBoth(function(res) {MochiKit.Logging.logDebug("User.saveRecords - 12 " + res); return res;});
                 deferredResult.callback();
                 
                 return deferredResult;
         },
 
         //-------------------------------------------------------------------------
 
         'removeRecord': function(aRecord) {
 //MochiKit.Logging.logDebug(">>> User.removeRecord");
@@ -410,66 +411,68 @@ MochiKit.Logging.logDebug("--- User.saveRecords - 2");
 
         //-------------------------------------------------------------------------
 
         'deleteRecordsAction': function(someRecords) {
                         vardeferredResult;
                 var parameters;
                 
 //MochiKit.Logging.logDebug(">>> User.deleteRecordsAction - someRecords.length: " + someRecords.length);
                 parameters = {};
                 deferredResult = new MochiKit.Async.Deferred();
 //deferredResult.addBoth(function(res) {MochiKit.Logging.logDebug("User.deleteRecordsAction - 1 " + res); return res;});
                 deferredResult.addCallback(Clipperz.NotificationCenter.deferredNotification, this, 'updatedProgressState', 'deleteRecord_collectData');
 //deferredResult.addBoth(function(res) {MochiKit.Logging.logDebug("User.deleteRecordsAction - 2 " + res); return res;});
                 deferredResult.addCallback(function(someParameters, someRecords) {
                         var recordReferences;
 
                         recordReferences = MochiKit.Base.map(function(aRecord) {
                                 var result;
                                 
                                 result = aRecord.reference();
                                 aRecord.remove();
 
                                 return result;
                         }, someRecords);
-                        someParameters.recordReferences = recordReferences;
+        //              someParameters.recordReferences = recordReferences;
+                        someParameters['records'] = { 'deleted': recordReferences};
                         
                         return someParameters;
                 }, parameters);
 //deferredResult.addBoth(function(res) {MochiKit.Logging.logDebug("User.deleteRecordsAction - 3 " + res); return res;});
                 deferredResult.addCallback(Clipperz.NotificationCenter.deferredNotification, this, 'updatedProgressState', 'deleteRecord_encryptData');
 //deferredResult.addBoth(function(res) {MochiKit.Logging.logDebug("User.deleteRecordsAction - 4 " + res); return res;});
                 deferredResult.addCallback(MochiKit.Base.method(this, 'encryptedData'));
 //deferredResult.addBoth(function(res) {MochiKit.Logging.logDebug("User.deleteRecordsAction - 5 " + res); return res;});
                 deferredResult.addCallback(function(someParameters, anUserEncryptedData) {
                         someParameters.user = anUserEncryptedData;
                         return someParameters;
                 }, parameters);
 //deferredResult.addBoth(function(res) {MochiKit.Logging.logDebug("User.deleteRecordsAction - 6 " + res); return res;});
                 deferredResult.addCallback(Clipperz.NotificationCenter.deferredNotification, this, 'updatedProgressState', 'deleteRecord_sendingData');
 //deferredResult.addBoth(function(res) {MochiKit.Logging.logDebug("User.deleteRecords parameters: " + Clipperz.Base.serializeJSON(res)); return res;});
 //deferredResult.addBoth(function(res) {MochiKit.Logging.logDebug("User.deleteRecordsAction - 7 " + res); return res;});
-                deferredResult.addCallback(MochiKit.Base.method(this.connection(), 'message'), 'deleteRecords');
+        //      deferredResult.addCallback(MochiKit.Base.method(this.connection(), 'message'), 'deleteRecords');
+                deferredResult.addCallback(MochiKit.Base.method(this.connection(), 'message'), 'saveChanges');
 //deferredResult.addBoth(function(res) {MochiKit.Logging.logDebug("User.deleteRecordsAction - 8 " + res); return res;});
                 deferredResult.addCallback(Clipperz.NotificationCenter.deferredNotification, this, 'updatedProgressState', 'deleteRecord_updatingInterface');
 //deferredResult.addBoth(function(res) {MochiKit.Logging.logDebug("User.deleteRecordsAction - 9 " + res); return res;});
                 deferredResult.callback(someRecords);
 //MochiKit.Logging.logDebug("<<< User.deleteRecordsAction");
                 
                 return deferredResult;
         },
 
         //-------------------------------------------------------------------------
 
         'resetAllLocalData': function() {
                 this.resetConnection();
 
                 this.setUsername("");
                 this.setPassphrase("");
 
                 this._header = null;
                 this._statistics = null;
                 this._preferences = null;
                 this._records = {};
                 this._directLoginReferences = {};
         },