Merge pull request #5593 from kennethlarsen/feature/5537-backport-to-3.2

[BUGFIX Backport] fix createRecord re-fetch
emberjs · Aug 27, 2018 · 0b61f20 · 0b61f20
2 parents b9e3638 + b39e11a
commit 0b61f20
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -16,6 +16,8 @@ branches:
     - master
     - beta
     - release
+    # prior release branches
+    - /^release-\d+-\d+/
     # npm version tags
     - /^v\d+\.\d+\.\d+/
 

diff --git a/addon/-private/system/relationships/state/relationship.js b/addon/-private/system/relationships/state/relationship.js
@@ -507,7 +507,7 @@ export default class Relationship {
     this.store._updateRelationshipState(this);
   }
 
-  updateLink(link, initial) {
+  updateLink(link) {
     heimdall.increment(updateLink);
     warn(
       `You pushed a record of type '${this.internalModel.modelName}' with a relationship '${
@@ -528,10 +528,6 @@ export default class Relationship {
     this.link = link;
     this.fetchPromise = null;
     this.setRelationshipIsStale(true);
-
-    if (!initial) {
-      this.internalModel.notifyPropertyChange(this.key);
-    }
   }
 
   reload() {
@@ -693,7 +689,7 @@ export default class Relationship {
       let relatedLink = _normalizeLink(payload.links.related);
       if (relatedLink && relatedLink.href && relatedLink.href !== this.link) {
         hasLink = true;
-        this.updateLink(relatedLink.href, initial);
+        this.updateLink(relatedLink.href);
       }
     }
 
@@ -721,6 +717,10 @@ export default class Relationship {
       this.setRelationshipIsEmpty(relationshipIsEmpty);
     } else if (hasLink) {
       this.setRelationshipIsStale(true);
+
+      if (!initial) {
+        this.internalModel.notifyPropertyChange(this.key);
+      }
     }
   }