author | Giulio Cesare Solaroli <giulio.cesare@clipperz.com> | 2012-06-16 07:22:01 (UTC) |
---|---|---|
committer | Giulio Cesare Solaroli <giulio.cesare@clipperz.com> | 2012-06-16 07:22:01 (UTC) |
commit | 9ae34bd825e9390eedb1a8c9842b2515699dac99 (patch) (side-by-side diff) | |
tree | f2efea0a967f890ce9235871fd26a96515596bc4 /frontend/beta | |
parent | 36ff1deefcbbd24aceca97eb39a13f9da4af8ff5 (diff) | |
parent | 36b3236415b856ddd0ad2804e82e410b5240ff4f (diff) | |
download | clipperz-9ae34bd825e9390eedb1a8c9842b2515699dac99.zip clipperz-9ae34bd825e9390eedb1a8c9842b2515699dac99.tar.gz clipperz-9ae34bd825e9390eedb1a8c9842b2515699dac99.tar.bz2 |
Merge pull request #40 from jokajak/issue37
fix the cancel button for editing cards
-rw-r--r-- | frontend/beta/js/Clipperz/PM/DataModel/Record.js | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/frontend/beta/js/Clipperz/PM/DataModel/Record.js b/frontend/beta/js/Clipperz/PM/DataModel/Record.js index ffb45de..9e496de 100644 --- a/frontend/beta/js/Clipperz/PM/DataModel/Record.js +++ b/frontend/beta/js/Clipperz/PM/DataModel/Record.js @@ -283,26 +283,32 @@ 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']; +// 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['key'] = this.currentVersionKey(); this.setCurrentVersion(new Clipperz.PM.DataModel.RecordVersion(this, currentVersionParameters)); if (someValues['data']['directLogins'] != null) { var directLoginReference; for (directLoginReference in someValues['data']['directLogins']) { var directLogin; var directLoginParameters; |