fix: merged marked as unchanged

wasabee-project · Jan 16, 2022 · 6ee17e3 · 6ee17e3
1 parent bb428b8
commit 6ee17e3
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/src/code/model/changes.ts b/src/code/model/changes.ts
@@ -186,6 +186,7 @@ export function operationChanges(origin: WasabeeOp, current: WasabeeOp) {
       "comment",
       "referencetime",
       "color",
+      "localchanged",
     ]),
     portals: compareList(
       origin.opportals,

diff --git a/src/code/model/operation.ts b/src/code/model/operation.ts
@@ -112,7 +112,7 @@ export default class WasabeeOp extends Evented implements IOperation {
     this.teamlist = obj.teamlist ? obj.teamlist : [];
     this.fetched = obj.fetched ? obj.fetched : null;
     this.stored = obj.stored ? obj.stored : null;
-    this.localchanged = obj.localchanged === false ? obj.localchanged : true;
+    this.localchanged = !!obj.localchanged;
     this.keysonhand = obj.keysonhand ? obj.keysonhand : [];
     this.zones = this.convertZonesToObjs(obj.zones);
     // this.modified = obj.modified ? obj.modified : null;