From 81c1ff986b5665a661a0eda1e45ca5994f27613b Mon Sep 17 00:00:00 2001 From: Ramon Bartl Date: Tue, 28 Aug 2018 11:18:50 +0200 Subject: [PATCH 1/2] Fix unicode encode error in sort method --- src/senaite/impress/analysisrequest/reportview.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/senaite/impress/analysisrequest/reportview.py b/src/senaite/impress/analysisrequest/reportview.py index 0ba584ff..81d9662b 100644 --- a/src/senaite/impress/analysisrequest/reportview.py +++ b/src/senaite/impress/analysisrequest/reportview.py @@ -16,6 +16,7 @@ import DateTime from bika.lims import POINTS_OF_CAPTURE from Products.CMFPlone.i18nl10n import ulocalized_time +from Products.CMFPlone.utils import safe_unicode from senaite import api from senaite.core.supermodel.interfaces import ISuperModel from senaite.impress import logger @@ -183,7 +184,7 @@ def sort_items(self, items, reverse=False): def sortable_title(obj): sort_key = obj.get("SortKey") or 0.0 title = obj.title.lower() - return u"{:010.3f}{}".format(sort_key, title) + return u"{:010.3f}{}".format(sort_key, safe_unicode(title)) def _cmp(obj1, obj2): st1 = sortable_title(obj1) From ec1dc1694cb752a4af066b575cb099124e7ad272 Mon Sep 17 00:00:00 2001 From: Ramon Bartl Date: Tue, 28 Aug 2018 11:20:57 +0200 Subject: [PATCH 2/2] Changelog updated --- docs/Changelog.rst | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/Changelog.rst b/docs/Changelog.rst index f7a28fe7..b2b3ae5d 100644 --- a/docs/Changelog.rst +++ b/docs/Changelog.rst @@ -1,6 +1,7 @@ 1.0.3 (unreleased) ------------------ +- #16: Fix unicode error in sort method - #15: Handle commas in recipient email name better - #13: Fix bootstrap columns CSS for WeasyPrint - #12: Added upgrade-step machinery