From 13859375bd8860ea815e58318100494ab805e809 Mon Sep 17 00:00:00 2001 From: Joan Sanchez Date: Thu, 4 Jun 2020 14:44:38 +0200 Subject: [PATCH 1/4] 2296 - Prevent log with no new changes --- loopback/common/models/loggable.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/loopback/common/models/loggable.js b/loopback/common/models/loggable.js index ec6989717..7aecfe976 100644 --- a/loopback/common/models/loggable.js +++ b/loopback/common/models/loggable.js @@ -259,6 +259,10 @@ module.exports = function(Self) { removeUnloggable(definition, oldInstance); removeUnloggable(definition, newInstance); + // Prevent log with no new changes + const hasNewChanges = Object.keys(newInstance) != 0; + if (!hasNewChanges) return; + let logRecord = { originFk: originId, userFk: userFk, From 9056801869710ac6ce478947fd7a925bdeb4b55e Mon Sep 17 00:00:00 2001 From: Joan Sanchez Date: Thu, 4 Jun 2020 14:46:55 +0200 Subject: [PATCH 2/4] Fix --- loopback/common/models/loggable.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/loopback/common/models/loggable.js b/loopback/common/models/loggable.js index 7aecfe976..99a1ad39b 100644 --- a/loopback/common/models/loggable.js +++ b/loopback/common/models/loggable.js @@ -260,7 +260,7 @@ module.exports = function(Self) { removeUnloggable(definition, newInstance); // Prevent log with no new changes - const hasNewChanges = Object.keys(newInstance) != 0; + const hasNewChanges = Object.keys(newInstance).length; if (!hasNewChanges) return; let logRecord = { From e25b87213beff174494713319f068cc9269bf7fb Mon Sep 17 00:00:00 2001 From: Joan Sanchez Date: Fri, 5 Jun 2020 08:23:52 +0200 Subject: [PATCH 3/4] 2305 - Added noReply param --- print/core/email.js | 3 ++- print/methods/closure.js | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/print/core/email.js b/print/core/email.js index cf6f8b663..f201be9a8 100644 --- a/print/core/email.js +++ b/print/core/email.js @@ -72,9 +72,10 @@ class Email extends Component { await getAttachments(this.path, this.attachments); const localeSubject = await this.getSubject(); + const replyTo = this.args.replyTo || this.args.auth.email; const options = { to: this.args.recipient, - replyTo: this.args.auth.email, + replyTo: replyTo, subject: localeSubject, html: rendered, attachments: attachments diff --git a/print/methods/closure.js b/print/methods/closure.js index c947a0468..3bcca9d4e 100644 --- a/print/methods/closure.js +++ b/print/methods/closure.js @@ -58,7 +58,8 @@ module.exports = app => { const args = Object.assign({ ticketId: ticket.id, recipientId: ticket.clientFk, - recipient: ticket.recipient + recipient: ticket.recipient, + replyTo: ticket.salesPersonEmail }, reqArgs); const email = new Email('delivery-note-link', args); From 048f01305d6a63dab257a18bfc7fa9311162f640 Mon Sep 17 00:00:00 2001 From: Joan Sanchez Date: Fri, 5 Jun 2020 13:14:14 +0200 Subject: [PATCH 4/4] 2220 - Added clearDisabled param --- front/core/components/field/index.html | 2 +- front/core/components/field/index.js | 1 + front/core/components/field/index.spec.js | 24 +++++++++++++++++++++++ front/core/components/textarea/index.js | 1 + front/core/components/textarea/style.scss | 8 ++++++++ 5 files changed, 35 insertions(+), 1 deletion(-) create mode 100644 front/core/components/field/index.spec.js create mode 100644 front/core/components/textarea/style.scss diff --git a/front/core/components/field/index.html b/front/core/components/field/index.html index b1b78be66..bd13f46d6 100644 --- a/front/core/components/field/index.html +++ b/front/core/components/field/index.html @@ -13,7 +13,7 @@
- diff --git a/front/core/components/field/index.js b/front/core/components/field/index.js index 81fd4cc6a..8d619e4a3 100644 --- a/front/core/components/field/index.js +++ b/front/core/components/field/index.js @@ -203,6 +203,7 @@ ngModule.vnComponent('vnField', { type: '@?', autocomplete: '@?', placeholder: '@?', + clearDisabled: ' { + let $element; + let controller; + + beforeEach(ngModule('vnCore')); + + beforeEach(inject(($compile, $rootScope) => { + $element = $compile(``)($rootScope); + controller = $element.controller('vnTextfield'); + })); + + afterEach(() => { + $element.remove(); + }); + + // Remove this block + describe('clearDisabled binding', () => { + it(`should enable the show property`, () => { + controller.clearDisabled = true; + + expect(controller.clearDisabled).toEqual(true); + }); + }); +}); diff --git a/front/core/components/textarea/index.js b/front/core/components/textarea/index.js index 1954b12c6..f8965830e 100644 --- a/front/core/components/textarea/index.js +++ b/front/core/components/textarea/index.js @@ -1,5 +1,6 @@ import ngModule from '../../module'; import Field from '../field'; +import './style.scss'; export default class Textarea extends Field { constructor($element, $scope, $compile) { diff --git a/front/core/components/textarea/style.scss b/front/core/components/textarea/style.scss new file mode 100644 index 000000000..2da8ad4d4 --- /dev/null +++ b/front/core/components/textarea/style.scss @@ -0,0 +1,8 @@ +.vn-textarea { + & > .container { + & > .icons { + display: flex; + align-items: flex-start; + } + } +} \ No newline at end of file