From 12ad0b7e348711fcd2459cf0c3d61d9e29c4480e Mon Sep 17 00:00:00 2001 From: Ramon Bartl Date: Thu, 13 Feb 2020 17:55:08 +0100 Subject: [PATCH 1/3] Fix flushing CCEmail fields in Sample Add Form --- bika/lims/browser/analysisrequest/add2.py | 2 +- bika/lims/browser/js/bika.lims.analysisrequest.add.js | 2 +- .../lims/browser/js/coffee/bika.lims.analysisrequest.add.coffee | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/bika/lims/browser/analysisrequest/add2.py b/bika/lims/browser/analysisrequest/add2.py index 484f67aeaa..8367c2a11d 100644 --- a/bika/lims/browser/analysisrequest/add2.py +++ b/bika/lims/browser/analysisrequest/add2.py @@ -826,7 +826,7 @@ def get_client_info(self, obj): # Set default CC Email field info["field_values"].update({ - "CCEmails": {"value": obj.getCCEmails()} + "CCEmails": {"value": obj.getCCEmails(), "if_empty": True} }) # UID of the client diff --git a/bika/lims/browser/js/bika.lims.analysisrequest.add.js b/bika/lims/browser/js/bika.lims.analysisrequest.add.js index fb6cceb8aa..b5250276bf 100644 --- a/bika/lims/browser/js/bika.lims.analysisrequest.add.js +++ b/bika/lims/browser/js/bika.lims.analysisrequest.add.js @@ -421,7 +421,7 @@ values_json = $.toJSON(values); field = $("#" + field_name + ("-" + arnum)); if ((values.if_empty != null) && values.if_empty === true) { - if (!field.val()) { + if (field.val() !== "") { return; } } diff --git a/bika/lims/browser/js/coffee/bika.lims.analysisrequest.add.coffee b/bika/lims/browser/js/coffee/bika.lims.analysisrequest.add.coffee index 4cecf9b89c..370406e6aa 100644 --- a/bika/lims/browser/js/coffee/bika.lims.analysisrequest.add.coffee +++ b/bika/lims/browser/js/coffee/bika.lims.analysisrequest.add.coffee @@ -415,7 +415,7 @@ class window.AnalysisRequestAdd if values.if_empty? and values.if_empty is true # Set the value if the field is empty only - if not field.val() + if field.val() isnt "" return console.debug "apply_dependent_value: field_name=#{field_name} field_values=#{values_json}" From c1f473d852dcf59151bd7da2d4b7777a80fe1ce8 Mon Sep 17 00:00:00 2001 From: Ramon Bartl Date: Thu, 13 Feb 2020 17:58:37 +0100 Subject: [PATCH 2/3] Changelog updated --- CHANGES.rst | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGES.rst b/CHANGES.rst index 403e2a9d23..778a6b7261 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -50,6 +50,7 @@ Changelog **Fixed** +- #1540 Fix flushing CCEmail fields in Sample Add Form - #1533 Fix traceback from log when rendering stickers preview - #1525 Fix error when creating partitions with analyst user - #1522 Fix sporadical timeout issue when adding new samples/remarks From 272f01880218cd66a5f9dc1a5af02322e791a7b2 Mon Sep 17 00:00:00 2001 From: Ramon Bartl Date: Thu, 13 Feb 2020 17:59:59 +0100 Subject: [PATCH 3/3] Improved condition --- bika/lims/browser/js/bika.lims.analysisrequest.add.js | 2 +- .../lims/browser/js/coffee/bika.lims.analysisrequest.add.coffee | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/bika/lims/browser/js/bika.lims.analysisrequest.add.js b/bika/lims/browser/js/bika.lims.analysisrequest.add.js index b5250276bf..0d9f001c41 100644 --- a/bika/lims/browser/js/bika.lims.analysisrequest.add.js +++ b/bika/lims/browser/js/bika.lims.analysisrequest.add.js @@ -421,7 +421,7 @@ values_json = $.toJSON(values); field = $("#" + field_name + ("-" + arnum)); if ((values.if_empty != null) && values.if_empty === true) { - if (field.val() !== "") { + if (field.val()) { return; } } diff --git a/bika/lims/browser/js/coffee/bika.lims.analysisrequest.add.coffee b/bika/lims/browser/js/coffee/bika.lims.analysisrequest.add.coffee index 370406e6aa..5dce4932b4 100644 --- a/bika/lims/browser/js/coffee/bika.lims.analysisrequest.add.coffee +++ b/bika/lims/browser/js/coffee/bika.lims.analysisrequest.add.coffee @@ -415,7 +415,7 @@ class window.AnalysisRequestAdd if values.if_empty? and values.if_empty is true # Set the value if the field is empty only - if field.val() isnt "" + if field.val() return console.debug "apply_dependent_value: field_name=#{field_name} field_values=#{values_json}"