diff --git a/CHANGES.rst b/CHANGES.rst index 4fed2fc37c..7dd3226a02 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -25,6 +25,7 @@ Changelog **Fixed** +- #385 Integration of PR-2309 Folderitems methods of Instrument Calibrations, Certifications and Validations are missing some objects - #384 Integration of PR-2306. Do not use localized date for chart js - #382 Integration of PR-2305. Bika Listing for Analysis Specifications fails on category expansion - #380 Integration of PR-2302. UnicodeDecodeError if title field validator diff --git a/bika/lims/browser/instrument.py b/bika/lims/browser/instrument.py index 8598eeb30f..08b537659c 100644 --- a/bika/lims/browser/instrument.py +++ b/bika/lims/browser/instrument.py @@ -90,6 +90,9 @@ def __init__(self, context, request): 'getMaintainer']}, ] + def contentsMethod(self, *args, **kw): + return self.context.getMaintenanceTasks() + def folderitems(self): items = BikaListingView.folderitems(self) outitems = [] @@ -166,6 +169,9 @@ def __init__(self, context, request): 'getCalibrator']}, ] + def contentsMethod(self, *args, **kw): + return self.context.getCalibrations() + def folderitems(self): items = BikaListingView.folderitems(self) outitems = [] @@ -223,6 +229,9 @@ def __init__(self, context, request): 'getValidator']}, ] + def contentsMethod(self, *args, **kw): + return self.context.getValidations() + def folderitems(self): items = BikaListingView.folderitems(self) outitems = [] @@ -304,6 +313,9 @@ def __init__(self, context, request): 'created']}, ] + def contentsMethod(self, *args, **kw): + return self.context.getSchedule() + def folderitems(self): items = BikaListingView.folderitems(self) outitems = []