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

PR-2305 Fixed TypeError in Analysis Specification category expansion #382

Merged
merged 3 commits into from
Nov 18, 2017
Merged

PR-2305 Fixed TypeError in Analysis Specification category expansion #382

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
91dac10
Fixed TypeError (#2305)
ramonski Nov 13, 2017
898e47b
Merge branch 'senaite-integration' into i2305
xispa Nov 18, 2017
9504354
Merge branch 'senaite-integration' into i2305
xispa Nov 18, 2017
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 @@ -25,6 +25,7 @@ Changelog

**Fixed**

- #382 Integration of PR-2305. Bika Listing for Analysis Specifications fails on category expansion
- #380 Integration of PR-2302. UnicodeDecodeError if title field validator
- #344 Integration of PR-2273. Ensure no counters in the number generator before initialising id server
- #282 Integration of PR-2266. Instrument Calibration Table fixes
Expand Down
2 changes: 1 addition & 1 deletion bika/lims/browser/templates/bika_listing_table_items.pt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -413,7 +413,7 @@
<span
autocomplete="off"
tal:condition="python:not allow_edit"
tal:content="python:item[column]['value']"/>
tal:content="python:item[column]"/>
</td>
</tr>
</tal:rangecomments>
Expand Down
2 changes: 1 addition & 1 deletion bika/lims/permissions.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -315,7 +315,7 @@ def setup_permissions(portal):
mp(permissions.ModifyPortalContent, ['Manager', 'LabManager', 'LabClerk', 'Owner'], 0)
mp(ManageClients, ['Manager', 'LabManager', 'LabClerk'], 0)
mp(permissions.AddPortalContent, ['Manager', 'LabManager', 'LabClerk', 'Owner'], 0)
mp(AddAnalysisSpec, ['Manager', 'LabManager', 'Owner'], 0)
mp(AddAnalysisSpec, ['Manager', 'LabManager', 'LabClerk', 'Owner'], 0)
portal.clients.reindexObject()

# We have to manually set the permissions of Contacts according to
Expand Down