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

Merge pull request #374 from strongloop/fix-conflict-resolution 

[2.0] Fix conflict resolution
This commit is contained in:
Miroslav Bajtoš 2014-07-15 20:51:08 +02:00
parent 555d48f4e0 da9b724222
commit b24d1e942b
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/application.js
View File

@ -154,6 +154,8 @@ app.model = function (Model, config) {
if (isPublic && Model.sharedClass) {
this.remotes().addClass(Model.sharedClass);
if (Model.settings.trackChanges && Model.Change)
this.remotes().addClass(Model.Change.sharedClass);
clearHandlerCache(this);
}

2
lib/models/change.js
View File

@ -609,7 +609,7 @@ Conflict.prototype.changes = function(cb) {
Conflict.prototype.resolve = function(cb) {
var conflict = this;
conflict.changes(function(err, sourceChange, targetChange) {
if(err) return callback(err);
if(err) return cb(err);
sourceChange.prev = targetChange.rev;
sourceChange.save(cb);
});