Skip to content

Commit

Permalink
Fix allow sample partitions in submitted states (senaite#2116)
Browse files Browse the repository at this point in the history
* Fix allow sample partitions in submitted states

This fixes the regression in PR-2024 for PR-1839:

- senaite#1839
- senaite#2024

* Fixed test
  • Loading branch information
ramonski committed Aug 21, 2022
1 parent 0a1f776 commit 06ad1e4
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 9 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -603,6 +603,7 @@
<exit-transition transition_id="reject" />
<exit-transition transition_id="rollback_to_receive" />
<exit-transition transition_id="detach" />
<exit-transition transition_id="create_partitions" />
<exit-transition transition_id="dispatch" />
<exit-transition transition_id="multi_results"/>
<!-- /TRANSITIONS -->
Expand All @@ -627,7 +628,7 @@
<permission-map name="senaite.core: Transition: Retract" acquired="True"/>
<permission-map name="senaite.core: Transition: Sample Sample" acquired="False"/>
<permission-map name="senaite.core: Transition: Schedule Sampling" acquired="False"/>
<permission-map name="senaite.core: Transition: Create Partitions" acquired="False"/>
<permission-map name="senaite.core: Transition: Create Partitions" acquired="True"/>

<permission-map name="senaite.core: Add Analysis" acquired="False">
<!-- LabClerk role has this permission granted by default in rolemap -->
Expand Down Expand Up @@ -793,6 +794,7 @@
<exit-transition transition_id="invalidate" />
<exit-transition transition_id="rollback_to_receive" />
<exit-transition transition_id="detach" />
<exit-transition transition_id="create_partitions" />
<exit-transition transition_id="dispatch" />
<exit-transition transition_id="multi_results"/>
<!-- /TRANSITIONS -->
Expand All @@ -817,7 +819,7 @@
<permission-map name="senaite.core: Transition: Retract" acquired="False"/>
<permission-map name="senaite.core: Transition: Sample Sample" acquired="False"/>
<permission-map name="senaite.core: Transition: Schedule Sampling" acquired="False"/>
<permission-map name="senaite.core: Transition: Create Partitions" acquired="False"/>
<permission-map name="senaite.core: Transition: Create Partitions" acquired="True"/>

<!-- Hide the 'Manage Analyses' tab -->
<permission-map name="senaite.core: Add Analysis" acquired="False"/>
Expand Down Expand Up @@ -896,6 +898,7 @@
<!-- TRANSITIONS -->
<exit-transition transition_id="republish"/>
<exit-transition transition_id="invalidate"/>
<exit-transition transition_id="create_partitions" />
<exit-transition transition_id="dispatch" />
<exit-transition transition_id="multi_results"/>
<!-- /TRANSITIONS -->
Expand All @@ -916,7 +919,7 @@
<permission-map name="senaite.core: Transition: Retract" acquired="False"/>
<permission-map name="senaite.core: Transition: Sample Sample" acquired="False"/>
<permission-map name="senaite.core: Transition: Schedule Sampling" acquired="False"/>
<permission-map name="senaite.core: Transition: Create Partitions" acquired="False"/>
<permission-map name="senaite.core: Transition: Create Partitions" acquired="True"/>
<!-- Hide the 'Manage Analyses' tab -->
<permission-map name="senaite.core: Add Analysis" acquired="False"/>
<!-- Hide the 'Manage Results' tab -->
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -91,13 +91,13 @@ Submit all analyses:
... analysis.setResult(12)
... success = do_action_for(analysis, "submit")

Partitions cannot be created when the status is `to_be_verified`:
Partitions can be created when the status is `to_be_verified`:

>>> api.get_workflow_status_of(ar)
'to_be_verified'

>>> isTransitionAllowed(ar, "create_partitions")
False
True

Verify all analyses:

Expand All @@ -106,22 +106,22 @@ Verify all analyses:
... success = do_action_for(analysis, "verify")
>>> setup.setSelfVerificationEnabled(False)

Partitions cannot be created when the status is `verified`:
Partitions can be created when the status is `verified`:

>>> api.get_workflow_status_of(ar)
'verified'

>>> isTransitionAllowed(ar, "create_partitions")
False
True

Partitions cannot be created when the status is `published`:
Partitions can be created when the status is `published`:

>>> success = do_action_for(ar, "publish")
>>> api.get_workflow_status_of(ar)
'published'

>>> isTransitionAllowed(ar, "create_partitions")
False
True

Partitions cannot be created when the status is `invalid`:

Expand Down

0 comments on commit 06ad1e4

Please sign in to comment.