summaryrefslogtreecommitdiff
authorClipperz <info@clipperz.com>2013-01-18 15:02:39 (UTC)
committer Clipperz <info@clipperz.com>2013-01-18 15:02:39 (UTC)
commit969b9f94a25931a765a4cd4765177979f66c1585 (patch) (side-by-side diff)
tree0b61de265b28c11260dc15256c30184454e7ef08
parentfac609cf1507ae82e7069b21724e089a9ac93869 (diff)
downloadclipperz-969b9f94a25931a765a4cd4765177979f66c1585.zip
clipperz-969b9f94a25931a765a4cd4765177979f66c1585.tar.gz
clipperz-969b9f94a25931a765a4cd4765177979f66c1585.tar.bz2
Fixed error when importing data
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--frontend/beta/js/Clipperz/PM/DataModel/User.js9
1 files changed, 7 insertions, 2 deletions
diff --git a/frontend/beta/js/Clipperz/PM/DataModel/User.js b/frontend/beta/js/Clipperz/PM/DataModel/User.js
index b065557..b29d224 100644
--- a/frontend/beta/js/Clipperz/PM/DataModel/User.js
+++ b/frontend/beta/js/Clipperz/PM/DataModel/User.js
@@ -305,17 +305,22 @@ MochiKit.Logging.logDebug("--- User.saveRecords - 1");
}
aRecord.syncDirectLoginReferenceValues();
aRecord.currentVersion().createNewVersion();
aRecord.updateKey();
});
MochiKit.Logging.logDebug("--- User.saveRecords - 2");
*/
- result = {'records': []};
+ result = {
+ 'records': {
+// 'deleted': [],
+ 'updated': []
+ }
+ };
deferredResult = new MochiKit.Async.Deferred();
c = someRecords.length;
for (i=0; i<c; i++) {
deferredResult.addCallback(function(aRecord) {
if (aRecord.headerNotes() != null) {
aRecord.setNotes(aRecord.headerNotes());
}
@@ -362,17 +367,17 @@ MochiKit.Logging.logDebug("--- User.saveRecords - 2");
//deferredResult.addBoth(function(res) {MochiKit.Logging.logDebug("User.saveRecords - 6.6 " + res); return res;});
deferredResult.addCallback(function(aResult, res) {
aResult['currentRecordVersion'] = res;
return aResult;
}, recordData);
//deferredResult.addBoth(function(res) {MochiKit.Logging.logDebug("User.saveRecords - 6.7 " + res); return res;});
deferredResult.addCallback(function(aResult, res) {
- aResult['records'] = { 'updated': [res] };
+ aResult['records']['updated'].push(res);
return aResult;
}, result);
//deferredResult.addBoth(function(res) {MochiKit.Logging.logDebug("User.saveRecords - 6.8 " + res); return res;});
}
//deferredResult.addBoth(function(res) {MochiKit.Logging.logDebug("User.saveRecords - 7 " + res); return res;});
deferredResult.addCallback(Clipperz.NotificationCenter.deferredNotification, this, 'updatedProgressState', 'saveCard_sendingData');
//deferredResult.addBoth(function(res) {MochiKit.Logging.logDebug("User.saveRecords - 8 " + res); return res;});