diff --git a/client/client/src/basic-data/index.html b/client/client/src/basic-data/index.html index a97fa3b84..885018df8 100644 --- a/client/client/src/basic-data/index.html +++ b/client/client/src/basic-data/index.html @@ -29,8 +29,8 @@ label="Comercial"> diff --git a/client/client/src/notes/index.html b/client/client/src/notes/index.html index c276409fd..39116d95b 100644 --- a/client/client/src/notes/index.html +++ b/client/client/src/notes/index.html @@ -4,7 +4,7 @@
{{n.creationTime | date:'dd/MM/yyyy HH:mm'}}
-
{{n.employeeFk}}
+
{{n.employeeFk.name}}
{{n.text}}
diff --git a/services/client/common/models/Client.json b/services/client/common/models/Client.json index d961bbe4c..4d621b083 100644 --- a/services/client/common/models/Client.json +++ b/services/client/common/models/Client.json @@ -147,8 +147,8 @@ }, "chanelFK":{ "type": "hasOne", - "model": "Chanel", - "foreignKey": "chanelFK" + "model": "ContactChannel", + "foreignKey": "contactChannelFk" } }, "acls": [ diff --git a/services/client/common/models/Chanel.json b/services/client/common/models/ContactChannel.json similarity index 93% rename from services/client/common/models/Chanel.json rename to services/client/common/models/ContactChannel.json index ec2edcacb..bfacd0926 100644 --- a/services/client/common/models/Chanel.json +++ b/services/client/common/models/ContactChannel.json @@ -1,5 +1,5 @@ { - "name": "Chanel", + "name": "ContactChannel", "base": "PersistedModel", "validateUpsert": true, "properties": { diff --git a/services/client/server/model-config.json b/services/client/server/model-config.json index b2190fdaa..61816602b 100644 --- a/services/client/server/model-config.json +++ b/services/client/server/model-config.json @@ -70,7 +70,7 @@ "dataSource": "vn", "public": true }, - "Chanel": { + "ContactChannel": { "dataSource": "vn", "public": true }