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.

Sign up for GitHub

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

Allow unassign transition for cancelled/rejected/retracted analyses #1461

Merged
merged 5 commits into from
Oct 17, 2019
Merged

Allow unassign transition for cancelled/rejected/retracted analyses #1461

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e3ac15d
Allow unassign transition for cancelled analyses
ramonski Oct 17, 2019
049bb0e
Allow unassign transition for retracted analyses
ramonski Oct 17, 2019
4b9b7d3
Allow unassign transition for rejected analyses
ramonski Oct 17, 2019
a8fa93a
Added comment line
ramonski Oct 17, 2019
30698a0
Updated changelog
ramonski Oct 17, 2019
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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ Changelog

**Fixed**

- #1461 Allow unassign transition for cancelled/rejected/retracted analyses
- #1449 sort_limit was not considered in ReferenceWidget searches
- #1449 Fix Clients were unable to add batches
- #1453 Fix initial IDs not starting with 1
Expand Down
5 changes: 3 additions & 2 deletions bika/lims/profiles/default/workflows/bika_analysis_workflow/definition.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -244,6 +244,7 @@

<!-- TRANSITIONS -->
<exit-transition transition_id="reinstate" />
<exit-transition transition_id="unassign" />
<!-- /TRANSITIONS -->

<!-- Only allow modification of fields explicitly granted
Expand Down Expand Up @@ -348,7 +349,7 @@
<state state_id="retracted" title="Retracted" i18n:attributes="title">

<!-- TRANSITIONS -->
<exit-transition transition_id="" />
<exit-transition transition_id="unassign" />
<!-- /TRANSITIONS -->

<!-- Only allow modification of fields explicitly granted
Expand Down Expand Up @@ -393,7 +394,7 @@
<state state_id="rejected" title="Rejected" i18n:attributes="title">

<!-- TRANSITIONS -->
<exit-transition transition_id="" />
<exit-transition transition_id="unassign" />
<!-- /TRANSITIONS -->

<!-- Only allow modification of fields explicitly granted
Expand Down
1 change: 1 addition & 0 deletions bika/lims/upgrade/v01_03_002.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ def upgrade(tool):
# Mixed permissions for transitions in client workflow (#1419)
# Allow to detach a partition from its primary sample (#1420)
# Allow clients to create batches (#1450)
# Allow unassign transition for cancelled/rejected/retracted analyses #1461
setup.runImportStepFromProfile(profile, "workflow")

# Allow to detach a partition from its primary sample (#1420)
Expand Down