@dhyasama/totem-merge 6.11.0 → 6.13.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/organizations.js +5 -5
- package/lib/people.js +1 -1
- package/package.json +1 -1
package/lib/organizations.js
CHANGED
|
@@ -71,7 +71,7 @@ var merge = function merge(context, target, source, mergedBy, customerId, cb) {
|
|
|
71
71
|
saveOrganization.bind(null, target, username),
|
|
72
72
|
|
|
73
73
|
// Change source references to target
|
|
74
|
-
updateReferences.bind(null, context, target, source, mergedBy)
|
|
74
|
+
updateReferences.bind(null, context, target, source, mergedBy, customerId)
|
|
75
75
|
|
|
76
76
|
], function(err, results) {
|
|
77
77
|
|
|
@@ -109,7 +109,7 @@ var mergeSourceIntoTarget = function mergeEntities(target, source, cb) {
|
|
|
109
109
|
'__v'
|
|
110
110
|
];
|
|
111
111
|
|
|
112
|
-
helpers.mergeObjects(target, source, doNotMergeKeys);
|
|
112
|
+
helpers.mergeObjects(target.toObject(), source.toObject(), doNotMergeKeys);
|
|
113
113
|
|
|
114
114
|
// keep a list of copied orgs
|
|
115
115
|
target.merge(source.id);
|
|
@@ -149,7 +149,7 @@ var verifyOkToMerge = function verifyOkToMerge(target, source, cb) {
|
|
|
149
149
|
|
|
150
150
|
};
|
|
151
151
|
|
|
152
|
-
var updateReferences = function updateReferences(context, target, source, mergedBy, cb) {
|
|
152
|
+
var updateReferences = function updateReferences(context, target, source, mergedBy, customerId, cb) {
|
|
153
153
|
|
|
154
154
|
logger.writeToInfoLog('Update references...');
|
|
155
155
|
|
|
@@ -173,7 +173,7 @@ var updateReferences = function updateReferences(context, target, source, merged
|
|
|
173
173
|
|
|
174
174
|
async.parallel([
|
|
175
175
|
updateCapTables.bind(context, newOrgId, oldOrgId),
|
|
176
|
-
updateDeals.bind(context, newOrgId, oldOrgId),
|
|
176
|
+
updateDeals.bind(context, newOrgId, oldOrgId, customerId),
|
|
177
177
|
updateFinancials.bind(context, newOrgId, oldOrgId),
|
|
178
178
|
updateLists.bind(context, newOrgId, oldOrgId),
|
|
179
179
|
updateMessages.bind(context, newOrgId, oldOrgId),
|
|
@@ -225,7 +225,7 @@ var updateCapTables = function updateCapTables(newOrgId, oldOrgId, cb) {
|
|
|
225
225
|
|
|
226
226
|
};
|
|
227
227
|
|
|
228
|
-
var updateDeals = function updateDeals(newOrgId, oldOrgId, cb) {
|
|
228
|
+
var updateDeals = function updateDeals(newOrgId, oldOrgId, customerId, cb) {
|
|
229
229
|
|
|
230
230
|
logger.writeToInfoLog(' Updating deals...');
|
|
231
231
|
|
package/lib/people.js
CHANGED
|
@@ -118,7 +118,7 @@ var mergeSourceIntoTarget = function mergeEntities(target, source, cb) {
|
|
|
118
118
|
|
|
119
119
|
};
|
|
120
120
|
|
|
121
|
-
helpers.mergeObjects(target, source, doNotMergeKeys);
|
|
121
|
+
helpers.mergeObjects(target.toObject(), source.toObject(), doNotMergeKeys);
|
|
122
122
|
|
|
123
123
|
target.sources = mergeSources(target, source);
|
|
124
124
|
|