verdnatura-mirror
/
loopback
mirror of https://github.com/strongloop/loopback.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix type conflict

This commit is contained in:
MarkovSergii 2018-07-19 09:54:55 +03:00 committed by GitHub
parent 49e81f02eb
commit d73b5d5830
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
common/models/change.js
View File

@ -799,16 +799,23 @@ module.exports = function(Change) {
Conflict.prototype.type = function(cb) {
var conflict = this;
this.changes(function(err, sourceChange, targetChange) {
if (err) return cb(err);
var sourceChangeType = sourceChange.type();
var targetChangeType = targetChange.type();
if (sourceChangeType === Change.UPDATE && targetChangeType === Change.UPDATE) {
return cb(null, Change.UPDATE);
if (err) return cb(err)
if (sourceChange && targetChange) {
var sourceChangeType = sourceChange.type()
var targetChangeType = targetChange.type()
if (sourceChangeType === 'update' && targetChangeType === 'update') {
return cb(null, 'update')
}
if (sourceChangeType === 'delete' || targetChangeType === 'delete') {
return cb(null, 'delete')
}
}
if (sourceChangeType === Change.DELETE || targetChangeType === Change.DELETE) {
return cb(null, Change.DELETE);
}
return cb(null, Change.UNKNOWN);
return cb(null, 'unknown')
});
};
};