Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Check permission when automatic sample reception is enabled #2419

Merged
merged 5 commits into from
Nov 12, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGES.rst
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ Changelog
2.5.0 (unreleased)
------------------

- #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
Expand Down
2 changes: 1 addition & 1 deletion src/bika/lims/utils/analysisrequest.py
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
2 changes: 1 addition & 1 deletion src/senaite/core/profiles/default/metadata.xml
Original file line number Diff line number Diff line change
@@ -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>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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"/>
Expand Down
8 changes: 8 additions & 0 deletions src/senaite/core/upgrade/v02_05_000.zcml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down