From 681cc4656fc1355a9b07531e6f561628c99aa669 Mon Sep 17 00:00:00 2001
From: Nick Winter <livelily@gmail.com>
Date: Tue, 2 Sep 2014 18:28:02 -0700
Subject: [PATCH] Fixed a bug with revertAttributes getting set during
SuperModel duplicate model merging.
---
app/models/CocoModel.coffee | 6 +++---
app/models/SuperModel.coffee | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/app/models/CocoModel.coffee b/app/models/CocoModel.coffee
index 4345ae728..8091035d8 100644
--- a/app/models/CocoModel.coffee
+++ b/app/models/CocoModel.coffee
@@ -61,11 +61,11 @@ class CocoModel extends Backbone.Model
else
super(attribute)
- set: ->
+ set: (attributes, options) ->
delete @attributesWithDefaults
inFlux = @loading or not @loaded
- @markToRevert() unless inFlux or @_revertAttributes
- res = super(arguments...)
+ @markToRevert() unless inFlux or @_revertAttributes or @project or options?.silent
+ res = super attributes, options
@saveBackup() if @saveBackups and (not inFlux) and @hasLocalChanges()
res
diff --git a/app/models/SuperModel.coffee b/app/models/SuperModel.coffee
index 07cafff46..930612edb 100644
--- a/app/models/SuperModel.coffee
+++ b/app/models/SuperModel.coffee
@@ -120,7 +120,7 @@ module.exports = class SuperModel extends Backbone.Model
cachedModel = @getModelByURL(model.getURL())
if cachedModel
clone = $.extend true, {}, model.attributes
- cachedModel.set(clone, {silent: true})
+ cachedModel.set(clone, {silent: true, fromMerge: true})
console.debug "Updated cached model <#{cachedModel.get('name') or cachedModel.getURL()}> with new data"
else
@registerModel(model)