Loggable fixes

loopback/common/models/loggable.js

@@ -25,8 +25,8 @@ module.exports = function(Self) {
 
         if (ctx.data) {
             const changes = pick(ctx.currentInstance, Object.keys(ctx.data));
-            newInstance = await fkToValue(ctx.data, ctx);
-            oldInstance = await fkToValue(changes, ctx);
+            newInstance = ctx.data;
+            oldInstance = changes;
 
             if (ctx.where && !ctx.currentInstance) {
                 const fields = Object.keys(ctx.data);
@@ -41,7 +41,7 @@ module.exports = function(Self) {
 
         // Get changes from created instance
         if (ctx.isNewInstance)
-            newInstance = await fkToValue(ctx.instance.__data, ctx);
+            newInstance = ctx.instance.__data;
 
         ctx.hookState.oldInstance = oldInstance;
         ctx.hookState.newInstance = newInstance;
@@ -261,6 +261,9 @@ module.exports = function(Self) {
         removeUnloggable(definition, oldInstance);
         removeUnloggable(definition, newInstance);
 
+        oldInstance = await fkToValue(oldInstance, ctx);
+        newInstance = await fkToValue(newInstance, ctx);
+
         // Prevent log with no new changes
         const hasNewChanges = Object.keys(newInstance).length;
         if (!hasNewChanges) return;

loopback/locale/en.json

@@ -93,5 +93,7 @@
 	"New ticket request has been created": "New ticket request has been created *'{{description}}'* for day *{{shipped}}*, with a quantity of *{{quantity}}*",
 	"There's a new urgent ticket": "There's a new urgent ticket: [{{title}}](https://cau.verdnatura.es/WorkOrder.do?woMode=viewWO&woID={{issueId}})",
 	"Swift / BIC cannot be empty": "Swift / BIC cannot be empty",
-	"Role name must be written in camelCase": "Role name must be written in camelCase"
+	"Role name must be written in camelCase": "Role name must be written in camelCase",
+	"None": "None",
+	"Client assignment has changed": "Client assignment has changed"
 }

modules/client/back/models/client.js

@@ -226,11 +226,6 @@ module.exports = Self => {
             };
             await Self.app.models.ClientCredit.create(newCredit);
         }
-
-        if (orgData)
-            ctx.hookState.oldInstance = Object.assign({}, orgData.__data);
-        if (finalState)
-            ctx.hookState.newInstance = Object.assign({}, finalState);
     });
 
     Self.observe('after save', async ctx => {