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

Mixed permissions for transitions in client workflow #1419

Merged
merged 3 commits into from
Aug 9, 2019
Merged

Mixed permissions for transitions in client workflow #1419

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6e77ca1
Permissions for deactivate and active in client workflow were mixed
xispa Aug 8, 2019
9c341f4
Added importstep (workflow) in upgrade 1.3.2
xispa Aug 8, 2019
5513551
Changelog
xispa Aug 8, 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 @@ -19,6 +19,7 @@ Changelog

**Fixed**

- #1419 Mixed permissions for transitions in client workflow
- #1414 Occasional "OSError: [Errno 24] Too many open files" in frontpage


Expand Down
4 changes: 2 additions & 2 deletions bika/lims/profiles/default/workflows/senaite_client_workflow/definition.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,15 +144,15 @@
<transition transition_id="activate" title="Activate" new_state="active" trigger="USER" before_script="" after_script="" i18n:attributes="title">
<action url="" category="workflow" icon="">Activate</action>
<guard>
<guard-permission>senaite.core: Transition: Deactivate</guard-permission>
<guard-permission>senaite.core: Transition: Activate</guard-permission>
<guard-expression>python:here.guard_handler("activate")</guard-expression>
</guard>
</transition>
<!-- Transition: deactivate -->
<transition transition_id="deactivate" title="Deactivate" new_state="inactive" trigger="USER" before_script="" after_script="" i18n:attributes="title">
<action url="" category="workflow" icon="">Deactivate</action>
<guard>
<guard-permission>senaite.core: Transition: Activate</guard-permission>
<guard-permission>senaite.core: Transition: Deactivate</guard-permission>
<guard-expression>python:here.guard_handler("deactivate")</guard-expression>
</guard>
</transition>
Expand Down
4 changes: 4 additions & 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 @@ -43,5 +43,9 @@ def upgrade(tool):

# -------- ADD YOUR STUFF BELOW --------

# Mixed permissions for transitions in client workflow
# https://github.com/senaite/senaite.core/pull/1419
setup.runImportStepFromProfile(profile, "workflow")

logger.info("{0} upgraded to version {1}".format(product, version))
return True