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

Jump to bottom

Fix WF state propagation on partition verification #1368

Merged
merged 6 commits into from
May 20, 2019
Merged

Fix WF state propagation on partition verification #1368

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
d621875
Allow published state as well
ramonski May 15, 2019
602cef9
Changelog updated
ramonski May 15, 2019
ec166ef
Merge branch 'master' into fix-verify-handler
xispa May 20, 2019
185719a
Use IVerified to check the status of the analysis
xispa May 20, 2019
0375bb7
Give priority to ANALYSIS_DETACHED_STATES check
xispa May 20, 2019
ff8ffbe
Better to always use the analysis object here
xispa May 20, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
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 @@ -24,6 +24,7 @@ Changelog

**Fixed**

- #1368 Fix WF state propagation on partition verification
- #1367 Clients can see interim values of analyses not yet verified
- #1361 Fix leap sample ID sequence after secondary sample
- #1344 Handle inline images in Results Interpretation
Expand Down
4 changes: 3 additions & 1 deletion bika/lims/workflow/analysisrequest/guards.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
# Some rights reserved, see README and LICENSE.

from bika.lims import api
from bika.lims.interfaces import IVerified
from bika.lims.workflow import isTransitionAllowed

# States to be omitted in regular transitions
Expand Down Expand Up @@ -97,7 +98,8 @@ def guard_verify(analysis_request):
analysis_status = api.get_workflow_status_of(analysis)
if analysis_status in ANALYSIS_DETACHED_STATES:
continue
if analysis_status != 'verified':
# All analyses must be in verified (or further) status
if not IVerified.providedBy(analysis):
return False
analyses_ready = True
return analyses_ready
Expand Down