summaryrefslogtreecommitdiff
authorGiulio 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)
commit9ae34bd825e9390eedb1a8c9842b2515699dac99 (patch) (side-by-side diff)
treef2efea0a967f890ce9235871fd26a96515596bc4
parent36ff1deefcbbd24aceca97eb39a13f9da4af8ff5 (diff)
parent36b3236415b856ddd0ad2804e82e410b5240ff4f (diff)
downloadclipperz-9ae34bd825e9390eedb1a8c9842b2515699dac99.zip
clipperz-9ae34bd825e9390eedb1a8c9842b2515699dac99.tar.gz
clipperz-9ae34bd825e9390eedb1a8c9842b2515699dac99.tar.bz2
Merge pull request #40 from jokajak/issue37
fix the cancel button for editing cards
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--frontend/beta/js/Clipperz/PM/DataModel/Record.js10
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
@@ -292,8 +292,14 @@ console.log("Record.processData", someValues);
this.setCurrentVersionKey(this.key());
}
-// currentVersionParameters = someValues['currentVersion'];
- currentVersionParameters = someValues['versions'][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();