From 7853236f2b1a85de2483c543a956f849a9bfdce9 Mon Sep 17 00:00:00 2001 From: gerard Date: Wed, 29 Aug 2018 12:43:44 +0200 Subject: [PATCH 1/2] resolved bug with alert level nonexistent --- services/loopback/common/methods/ticket/isEditable.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/services/loopback/common/methods/ticket/isEditable.js b/services/loopback/common/methods/ticket/isEditable.js index 0edd3259d0..ad3f6b7fd5 100644 --- a/services/loopback/common/methods/ticket/isEditable.js +++ b/services/loopback/common/methods/ticket/isEditable.js @@ -20,9 +20,10 @@ module.exports = Self => { }); Self.isEditable = async ticketFk => { - let state = await Self.app.models.TicketState.findOne({where: {ticketFk: ticketFk}, fields: 'alertLevel'}); + let state = await Self.app.models.TicketState.findOne({where: {ticketFk: ticketFk}}); + let alertLevel = state ? state.alertLevel : null; let exists = await Self.app.models.Ticket.findOne({where: {id: ticketFk}, fields: 'isDeleted'}); - if (!exists || exists.isDeleted == 1 || state.alertLevel > 0) + if (!exists || exists.isDeleted == 1 || (alertLevel && alertLevel > 0)) return false; return true; From 3c675b99a0ba6d539ea35421f7a93733f945b786 Mon Sep 17 00:00:00 2001 From: gerard Date: Wed, 29 Aug 2018 13:55:47 +0200 Subject: [PATCH 2/2] bug with clear solved CR JOAN --- client/core/src/components/textfield/textfield.html | 1 - 1 file changed, 1 deletion(-) diff --git a/client/core/src/components/textfield/textfield.html b/client/core/src/components/textfield/textfield.html index 4f238c525a..3c77c2ab84 100644 --- a/client/core/src/components/textfield/textfield.html +++ b/client/core/src/components/textfield/textfield.html @@ -23,7 +23,6 @@ translate-attr="{title: 'Clear'}" ng-show="!$ctrl.disabled && $ctrl.hasValue - && ($ctrl.hasFocus) && !$ctrl.unclearable" ng-click="$ctrl.clear()"> clear