Merge remote-tracking branch 'origin/server_database_merge' into authentication

1 files changed, 13 insertions, 5 deletions

diff --git a/src/fields/BasicField.ts b/src/fields/BasicField.ts
index 9476f5d21..15eb067a0 100644
--- a/src/fields/BasicField.ts
+++ b/src/fields/BasicField.ts
@@ -3,14 +3,23 @@ import { observable, computed, action } from "mobx";
 import { Server } from "../client/Server";
 
 export abstract class BasicField<T> extends Field {
-    constructor(data: T, id: FIELD_ID = undefined) {
+    constructor(data: T, save: boolean, id: FIELD_ID = undefined) {
         super(id);
 
         this.data = data;
+        if (save) {
+            Server.UpdateField(this)
+        }
+    }
+
+    UpdateFromServer(data: any) {
+        if (this.data !== data) {
+            this.data = data;
+        }
     }
 
     @observable
-    private data: T;
+    protected data: T;
 
     @computed
     get Data(): T {
@@ -18,10 +27,9 @@ export abstract class BasicField<T> extends Field {
     }
 
     set Data(value: T) {
-        if (this.data === value) {
-            return;
+        if (this.data != value) {
+            this.data = value;
         }
-        this.data = value;
         Server.UpdateField(this);
     }