Diffstat (limited to 'frontend/beta/js/Clipperz/PM/DataModel/Record.js') (more/less context) (show whitespace changes)
-rw-r--r-- | frontend/beta/js/Clipperz/PM/DataModel/Record.js | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/frontend/beta/js/Clipperz/PM/DataModel/Record.js b/frontend/beta/js/Clipperz/PM/DataModel/Record.js index d6ebb39..f89f79c 100644 --- a/frontend/beta/js/Clipperz/PM/DataModel/Record.js +++ b/frontend/beta/js/Clipperz/PM/DataModel/Record.js | |||
@@ -258,71 +258,70 @@ Clipperz.PM.DataModel.Record.prototype = MochiKit.Base.update(null, { | |||
258 | result['data'] = someDecryptedValues; | 258 | result['data'] = someDecryptedValues; |
259 | 259 | ||
260 | return result; | 260 | return result; |
261 | }, anEncryptedData); | 261 | }, anEncryptedData); |
262 | deferredResult.addCallback(MochiKit.Base.method(this, 'setDecryptedData')); | 262 | deferredResult.addCallback(MochiKit.Base.method(this, 'setDecryptedData')); |
263 | deferredResult.callback(); | 263 | deferredResult.callback(); |
264 | 264 | ||
265 | result = deferredResult; | 265 | result = deferredResult; |
266 | } else { | 266 | } else { |
267 | result = MochiKit.Async.succeed(this.decryptedData()); | 267 | result = MochiKit.Async.succeed(this.decryptedData()); |
268 | } | 268 | } |
269 | //MochiKit.Logging.logDebug("<<< [" + (new Date()).valueOf() + "] Record.decryptData"); | 269 | //MochiKit.Logging.logDebug("<<< [" + (new Date()).valueOf() + "] Record.decryptData"); |
270 | 270 | ||
271 | return result; | 271 | return result; |
272 | }, | 272 | }, |
273 | 273 | ||
274 | //------------------------------------------------------------------------- | 274 | //------------------------------------------------------------------------- |
275 | 275 | ||
276 | 'processData': function(someValues) { | 276 | 'processData': function(someValues) { |
277 | //MochiKit.Logging.logDebug(">>> [" + (new Date()).valueOf() + "] Record.processData"); | 277 | //MochiKit.Logging.logDebug(">>> [" + (new Date()).valueOf() + "] Record.processData"); |
278 | //MochiKit.Logging.logDebug("--- Record.processData: " + Clipperz.Base.serializeJSON(someValues)); | 278 | //MochiKit.Logging.logDebug("--- Record.processData: " + Clipperz.Base.serializeJSON(someValues)); |
279 | if (this.shouldProcessData()) { | 279 | if (this.shouldProcessData()) { |
280 | var currentVersionParameters; | 280 | var currentVersionParameters; |
281 | 281 | ||
282 | console.log("Record.processData", someValues); | ||
283 | this.processDataToExtractLegacyValues(someValues['data']); | 282 | this.processDataToExtractLegacyValues(someValues['data']); |
284 | 283 | ||
285 | if (typeof(someValues['data']['notes']) != 'undefined') { | 284 | if (typeof(someValues['data']['notes']) != 'undefined') { |
286 | this.setNotes(someValues['data']['notes']); | 285 | this.setNotes(someValues['data']['notes']); |
287 | } | 286 | } |
288 | 287 | ||
289 | if (someValues['data']['currentVersionKey'] != null) { | 288 | if (someValues['data']['currentVersionKey'] != null) { |
290 | this.setCurrentVersionKey(someValues['data']['currentVersionKey']); | 289 | this.setCurrentVersionKey(someValues['data']['currentVersionKey']); |
291 | } else { | 290 | } else { |
292 | this.setCurrentVersionKey(this.key()); | 291 | this.setCurrentVersionKey(this.key()); |
293 | } | 292 | } |
294 | 293 | ||
295 | // community edition doesn't currently pass version | 294 | // community edition doesn't currently pass version information |
296 | // information | ||
297 | if (someValues['versions'] == null) { | 295 | if (someValues['versions'] == null) { |
298 | currentVersionParameters = someValues['currentVersion']; | 296 | currentVersionParameters = someValues['currentVersion']; |
299 | } else { | 297 | } else { |
300 | currentVersionParameters = someValues['versions'][someValues['currentVersion']]; | 298 | currentVersionParameters = someValues['versions'][someValues['currentVersion']]; |
301 | } | 299 | } |
302 | 300 | ||
303 | console.log("Record.processData - this.currentVersionKey()", this.currentVersionKey()); | 301 | //- currentVersionParameters = someValues['currentVersion']; |
304 | console.log("Record.processData - currentVersionParameters", currentVersionParameters); | 302 | // currentVersionParameters = someValues['versions'][someValues['currentVersion']]; |
303 | |||
305 | currentVersionParameters['key'] = this.currentVersionKey(); | 304 | currentVersionParameters['key'] = this.currentVersionKey(); |
306 | this.setCurrentVersion(new Clipperz.PM.DataModel.RecordVersion(this, currentVersionParameters)); | 305 | this.setCurrentVersion(new Clipperz.PM.DataModel.RecordVersion(this, currentVersionParameters)); |
307 | 306 | ||
308 | if (someValues['data']['directLogins'] != null) { | 307 | if (someValues['data']['directLogins'] != null) { |
309 | vardirectLoginReference; | 308 | vardirectLoginReference; |
310 | 309 | ||
311 | for (directLoginReference in someValues['data']['directLogins']) { | 310 | for (directLoginReference in someValues['data']['directLogins']) { |
312 | var directLogin; | 311 | var directLogin; |
313 | var directLoginParameters; | 312 | var directLoginParameters; |
314 | 313 | ||
315 | directLoginParameters = someValues['data']['directLogins'][directLoginReference]; | 314 | directLoginParameters = someValues['data']['directLogins'][directLoginReference]; |
316 | directLoginParameters.record = this; | 315 | directLoginParameters.record = this; |
317 | directLoginParameters.reference = directLoginReference; | 316 | directLoginParameters.reference = directLoginReference; |
318 | 317 | ||
319 | directLogin = new Clipperz.PM.DataModel.DirectLogin(directLoginParameters); | 318 | directLogin = new Clipperz.PM.DataModel.DirectLogin(directLoginParameters); |
320 | this.addDirectLogin(directLogin, true); | 319 | this.addDirectLogin(directLogin, true); |
321 | } | 320 | } |
322 | } | 321 | } |
323 | this.setShouldProcessData(false); | 322 | this.setShouldProcessData(false); |
324 | } | 323 | } |
325 | 324 | ||
326 | Clipperz.NotificationCenter.notify(this, 'recordDataReady'); | 325 | Clipperz.NotificationCenter.notify(this, 'recordDataReady'); |
327 | //MochiKit.Logging.logDebug("<<< [" + (new Date()).valueOf() + "] Record.processData"); | 326 | //MochiKit.Logging.logDebug("<<< [" + (new Date()).valueOf() + "] Record.processData"); |
328 | //MochiKit.Logging.logDebug("<<< Record.processData"); | 327 | //MochiKit.Logging.logDebug("<<< Record.processData"); |