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

Remove zcatalog monkey (and getRequestUID index) #1535

Merged
merged 1 commit into from
Feb 12, 2020
Merged

Remove zcatalog monkey (and getRequestUID index) #1535

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 @@ -41,6 +41,7 @@ Changelog

**Removed**

- #1535 Remove `zcatalog` monkey (and `getRequestUID` index)
- #1518 Removed stale indexes from `analysis_catalog`
- #1516 Removed getResultsRange metadata from analysis_catalog
- #1487 Dexterity Compatible Catalog Base Class
Expand Down
4 changes: 2 additions & 2 deletions bika/lims/browser/analysisrequest/tables.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ def __init__(self, context, request):

self.contentFilter.update({
"getPointOfCapture": "lab",
"getRequestUID": api.get_uid(context)
"getAncestorsUIDs": [api.get_uid(context)]
})

self.form_id = "lab_analyses"
Expand All @@ -52,7 +52,7 @@ def __init__(self, context, request):

self.contentFilter.update({
"getPointOfCapture": "field",
"getRequestUID": api.get_uid(context)
"getAncestorsUIDs": [api.get_uid(context)]
})

self.form_id = "field_analyses"
Expand Down
1 change: 0 additions & 1 deletion bika/lims/catalog/analysis_catalog.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@
_indexes_dict = {
"sortable_title": "FieldIndex",
"getParentUID": "FieldIndex",
"getRequestUID": "FieldIndex",
"getDueDate": "DateIndex",
"getDateReceived": "DateIndex",
"getResultCaptureDate": "DateIndex",
Expand Down
8 changes: 0 additions & 8 deletions bika/lims/monkey/configure.zcml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,12 +58,4 @@
replacement=".Widget.isVisible"
/>

<!-- Mask analyses with those from descendants (partitioning) -->
<monkey:patch
description=""
class="Products.ZCatalog.ZCatalog.ZCatalog"
original="searchResults"
replacement=".zcatalog.searchResults"
/>

</configure>
47 changes: 0 additions & 47 deletions bika/lims/monkey/zcatalog.py
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions bika/lims/upgrade/v01_03_003.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -216,6 +216,7 @@
# Only used in Add analyses (as sortable column)
(CATALOG_ANALYSIS_LISTING, "getClientOrderNumber"),
(CATALOG_ANALYSIS_LISTING, "getDateSampled"),
(CATALOG_ANALYSIS_LISTING, "getRequestUID"),

]

Expand Down