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

Hide unit display after fields in manage analyses listing #1815

Merged
merged 2 commits into from
Jun 21, 2021
Merged

Hide unit display after fields in manage analyses listing #1815

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7bc097a
Rename Unit -> ResultUnit
ramonski Jun 20, 2021
0b1fca5
Changelog updated
ramonski Jun 20, 2021
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 @@ -4,6 +4,7 @@ Changelog
2.0.0 (unreleased)
------------------

- #1815 Hide unit display after fields in manage analyses listing
- #1811 Datagrid field and widget for Dexterity types
- #1810 Revert changes of PR #1767
- #1806 Added base structure to implement custom dexterity fields and widgets
Expand Down
4 changes: 2 additions & 2 deletions src/bika/lims/browser/analysisrequest/manage_analyses.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ def __init__(self, context, request):
"title": _("Service"),
"index": "sortable_title",
"sortable": False}),
("Unit", {
("ResultUnit", {
"title": _("Unit"),
"sortable": False}),
("Hidden", {
Expand Down Expand Up @@ -235,7 +235,7 @@ def folderitem(self, obj, item, index):
spec = rr.get(keyword, ResultsRangeDict())

item["Title"] = obj.Title()
item["Unit"] = obj.getUnit()
item["ResultUnit"] = obj.getUnit()
item["Price"] = price
item["before"]["Price"] = self.get_currency_symbol()
item["allow_edit"] = self.get_editable_columns(obj)
Expand Down