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) (unidiff) | |
tree | f2efea0a967f890ce9235871fd26a96515596bc4 /frontend/beta/js | |
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 | 10 |
1 files changed, 8 insertions, 2 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 | |||
@@ -291,10 +291,16 @@ console.log("Record.processData", someValues); | |||
291 | } else { | 291 | } else { |
292 | this.setCurrentVersionKey(this.key()); | 292 | this.setCurrentVersionKey(this.key()); |
293 | } | 293 | } |
294 | 294 | ||
295 | // currentVersionParameters = someValues['currentVersion']; | 295 | // community edition doesn't currently pass version |
296 | currentVersionParameters = someValues['versions'][someValues['currentVersion']]; | 296 | // information |
297 | if (someValues['versions'] == null) { | ||
298 | currentVersionParameters = someValues['currentVersion']; | ||
299 | } else { | ||
300 | currentVersionParameters = someValues['versions'][someValues['currentVersion']]; | ||
301 | } | ||
302 | |||
297 | console.log("Record.processData - this.currentVersionKey()", this.currentVersionKey()); | 303 | console.log("Record.processData - this.currentVersionKey()", this.currentVersionKey()); |
298 | console.log("Record.processData - currentVersionParameters", currentVersionParameters); | 304 | console.log("Record.processData - currentVersionParameters", currentVersionParameters); |
299 | currentVersionParameters['key'] = this.currentVersionKey(); | 305 | currentVersionParameters['key'] = this.currentVersionKey(); |
300 | this.setCurrentVersion(new Clipperz.PM.DataModel.RecordVersion(this, currentVersionParameters)); | 306 | this.setCurrentVersion(new Clipperz.PM.DataModel.RecordVersion(this, currentVersionParameters)); |