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 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..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 4cecf9b89c..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 not field.val() + if field.val() return console.debug "apply_dependent_value: field_name=#{field_name} field_values=#{values_json}"