Merge branch '2.x' into fix-reload-in-multi-results-classic-view

Author: xispa

CHANGES.rst

@@ -5,6 +5,7 @@ Changelog
 ------------------
 
 - #2420 Fix page reload in multi results classic view
+- #2419 Check permission when automatic sample reception is enabled
 - #2416 Fix Template select empties existing Sample Type-, Point- and Profile values in sample add form
 - #2414 Fix missing empty selection in result option choices when no default value is set
 - #2415 Fix sample specs get overwritten on manage analyses save

src/bika/lims/utils/analysisrequest.py

@@ -142,7 +142,7 @@ def create_analysisrequest(client, request, values, analyses=None,
             changeWorkflowState(ar, SAMPLE_WORKFLOW, "to_be_sampled",
                                 action="to_be_sampled")
         elif setup.getAutoreceiveSamples():
-            receive_sample(ar)
+            receive_sample(ar, check_permission=True)
         else:
             changeWorkflowState(ar, SAMPLE_WORKFLOW, "sample_due",
                                 action="no_sampling_workflow")

src/senaite/core/profiles/default/metadata.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <metadata>
-  <version>2519</version>
+  <version>2520</version>
   <dependencies>
     <dependency>profile-Products.ATContentTypes:base</dependency>
     <dependency>profile-Products.CMFEditions:CMFEditions</dependency>

src/senaite/core/profiles/default/workflows/senaite_sample_workflow/definition.xml

@@ -121,7 +121,10 @@
     <permission-map name="senaite.core: Transition: Invalidate" acquired="False"/>
     <permission-map name="senaite.core: Transition: Preserve Sample" acquired="False"/>
     <permission-map name="senaite.core: Transition: Publish Results" acquired="False"/>
-    <permission-map name="senaite.core: Transition: Receive Sample" acquired="False"/>
+    <!-- This is required to enable permission checking during sample creation
+         if automatic sample reception is enabled:
+         https://github.com/senaite/senaite.core/pull/2419 -->
+    <permission-map name="senaite.core: Transition: Receive Sample" acquired="True"/>
     <permission-map name="senaite.core: Transition: Reject Sample" acquired="False"/>
     <permission-map name="senaite.core: Transition: Retract" acquired="False"/>
     <permission-map name="senaite.core: Transition: Sample Sample" acquired="False"/>

src/senaite/core/upgrade/v02_05_000.zcml

@@ -3,6 +3,14 @@
     xmlns:genericsetup="http://namespaces.zope.org/genericsetup"
     i18n_domain="senaite.core">
 
+  <genericsetup:upgradeStep
+      title="SENAITE.CORE 2.5.0: Import Workflow"
+      description="Update Managed Permissions of Sample Workflow"
+      source="2519"
+      destination="2520"
+      handler=".v02_05_000.import_workflow"
+      profile="senaite.core:default"/>
+
   <genericsetup:upgradeStep
       title="SENAITE.CORE 2.5.0: Reindex control analyses"
       description="Reindex all control analyses to fix stale `getReferenceAnalysesGroupID` index"