1 files changed, 6 insertions, 1 deletions

diff --git a/frontend/beta/js/Clipperz/PM/DataModel/Record.js b/frontend/beta/js/Clipperz/PM/DataModel/Record.js
index 270f2ae..ffb45de 100644
--- a/frontend/beta/js/Clipperz/PM/DataModel/Record.js
+++ b/frontend/beta/js/Clipperz/PM/DataModel/Record.js
@@ -258,60 +258,65 @@ Clipperz.PM.DataModel.Record.prototype = MochiKit.Base.update(null, {
                                 result['data'] = someDecryptedValues;
                         
                                 return result;
                         }, anEncryptedData);
                         deferredResult.addCallback(MochiKit.Base.method(this, 'setDecryptedData'));
                         deferredResult.callback();
 
                         result = deferredResult;
                 } else {
                         result = MochiKit.Async.succeed(this.decryptedData());
                 }
 //MochiKit.Logging.logDebug("<<< [" + (new Date()).valueOf() + "] Record.decryptData");
 
                 return result;
         },
 
         //-------------------------------------------------------------------------
 
         'processData': function(someValues) {
 //MochiKit.Logging.logDebug(">>> [" + (new Date()).valueOf() + "] Record.processData");
 //MochiKit.Logging.logDebug("--- Record.processData: " + Clipperz.Base.serializeJSON(someValues));
                 if (this.shouldProcessData()) {
                         var currentVersionParameters;
 
+console.log("Record.processData", someValues);
                         this.processDataToExtractLegacyValues(someValues['data']);
 
                         if (typeof(someValues['data']['notes']) != 'undefined') {
                                 this.setNotes(someValues['data']['notes']);
                         }
+
                         if (someValues['data']['currentVersionKey'] != null) {
                                 this.setCurrentVersionKey(someValues['data']['currentVersionKey']);
                         } else {
                                 this.setCurrentVersionKey(this.key());
                         }
 
-                        currentVersionParameters = someValues['currentVersion'];
+        //              currentVersionParameters = someValues['currentVersion'];
+                        currentVersionParameters = someValues['versions'][someValues['currentVersion']];
+console.log("Record.processData - this.currentVersionKey()", this.currentVersionKey());
+console.log("Record.processData - currentVersionParameters", currentVersionParameters);
                         currentVersionParameters['key'] = this.currentVersionKey();
                         this.setCurrentVersion(new Clipperz.PM.DataModel.RecordVersion(this, currentVersionParameters));
                         
                         if (someValues['data']['directLogins'] != null) {
                                         vardirectLoginReference;
                         
                                 for (directLoginReference in someValues['data']['directLogins']) {
                                         var directLogin;
                                         var directLoginParameters;
                                 
                                         directLoginParameters = someValues['data']['directLogins'][directLoginReference];
                                         directLoginParameters.record = this;
                                         directLoginParameters.reference = directLoginReference;
                                 
                                         directLogin = new Clipperz.PM.DataModel.DirectLogin(directLoginParameters);
                                         this.addDirectLogin(directLogin, true);
                                 }
                         }
                         this.setShouldProcessData(false);
                 }
                 
                 Clipperz.NotificationCenter.notify(this, 'recordDataReady');
 //MochiKit.Logging.logDebug("<<< [" + (new Date()).valueOf() + "] Record.processData");
 //MochiKit.Logging.logDebug("<<< Record.processData");