From a04e08865d4b5bc4ee7e5b31b3c7056ad6c79fa4 Mon Sep 17 00:00:00 2001 From: Ramon Bartl Date: Sun, 22 Dec 2019 19:48:09 +0100 Subject: [PATCH 1/2] Fix KeyError in Sample Type Listing Fix KeyError when some subfields of the retention period are omitted. Traceback (innermost last): Module ZPublisher.Publish, line 138, in publish Module ZPublisher.mapply, line 77, in mapply Module ZPublisher.Publish, line 48, in call_object Module senaite.core.listing.view, line 222, in __call__ Module senaite.core.listing.ajax, line 101, in handle_subpath Module senaite.core.listing.decorators, line 63, in wrapper Module senaite.core.listing.decorators, line 50, in wrapper Module senaite.core.listing.decorators, line 100, in wrapper Module senaite.core.listing.ajax, line 533, in ajax_folderitems Module senaite.core.listing.decorators, line 88, in wrapper Module senaite.core.listing.ajax, line 305, in get_folderitems Module senaite.core.listing.view, line 837, in folderitems Module bika.lims, line 224, in wrapper Module senaite.core.listing.view, line 1143, in _folderitems Module bika.lims.controlpanel.bika_sampletypes, line 157, in folderitem KeyError: 'minutes' --- bika/lims/controlpanel/bika_sampletypes.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/bika/lims/controlpanel/bika_sampletypes.py b/bika/lims/controlpanel/bika_sampletypes.py index 13cc681299..6e25efe4bf 100644 --- a/bika/lims/controlpanel/bika_sampletypes.py +++ b/bika/lims/controlpanel/bika_sampletypes.py @@ -152,9 +152,9 @@ def folderitem(self, obj, item, index): retention_period = obj.getRetentionPeriod() if retention_period: - hours = retention_period["hours"] - minutes = retention_period["minutes"] - days = retention_period["days"] + hours = retention_period.get("hours", "0") + minutes = retention_period.get("minutes", "0") + days = retention_period.get("days", "0") item["RetentionPeriod"] = _("hours: {} minutes: {} days: {}" .format(hours, minutes, days)) else: From 84c4d4f1d172bd98572bb83ec2fe0cf4e85f2537 Mon Sep 17 00:00:00 2001 From: Ramon Bartl Date: Sun, 22 Dec 2019 19:57:02 +0100 Subject: [PATCH 2/2] Changelog updated --- CHANGES.rst | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGES.rst b/CHANGES.rst index 9046383d78..271fe5d77f 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -28,6 +28,7 @@ Changelog **Fixed** +- #1494 Fix KeyError in Sample Type Listing - #1477 Sample edit form - some selection widgets empty - #1478 Clients default CC E-Mails missing in Add Sample - #1479 Fixed too many redirects error: Labclerks viewing verified worksheets