clipperz/password-manager-mirror
1
0
Fork 0
mirror of http://git.whoc.org.uk/git/password-manager.git synced 2025-10-25 01:37:34 +02:00
Code Issues Releases Wiki Activity

Merge latest changes with public repository

Browse Source
This commit is contained in:
Clipperz
2013-01-09 12:45:31 +01:00
parent 8ef30d00eb
commit 9741a93a9f
3 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
frontend/beta/js/Clipperz/PM/DataModel/Record.js
View File

@@ -279,7 +279,6 @@ Clipperz.PM.DataModel.Record.prototype = MochiKit.Base.update(null, {
if (this.shouldProcessData()) {
var currentVersionParameters;
console.log("Record.processData", someValues);
this.processDataToExtractLegacyValues(someValues['data']);
if (typeof(someValues['data']['notes']) != 'undefined') {
@@ -292,16 +291,16 @@ console.log("Record.processData", someValues);
this.setCurrentVersionKey(this.key());
}
// community edition doesn't currently pass version
// information
// community edition doesn't currently pass version information
if (someValues['versions'] == null) {
currentVersionParameters = someValues['currentVersion'];
} else {
currentVersionParameters = someValues['versions'][someValues['currentVersion']];
}
console.log("Record.processData - this.currentVersionKey()", this.currentVersionKey());
console.log("Record.processData - currentVersionParameters", currentVersionParameters);
//- currentVersionParameters = someValues['currentVersion'];
// currentVersionParameters = someValues['versions'][someValues['currentVersion']];
currentVersionParameters['key'] = this.currentVersionKey();
this.setCurrentVersion(new Clipperz.PM.DataModel.RecordVersion(this, currentVersionParameters));