From f755aefbfa41b5b249d64f94920608e540dae74a Mon Sep 17 00:00:00 2001 From: Lance Edgar Date: Tue, 12 Mar 2019 15:13:34 -0500 Subject: [PATCH] Honor enum sort order where possible, for grid filter values --- tailbone/grids/filters.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/tailbone/grids/filters.py b/tailbone/grids/filters.py index 93c0e669..305a0cfa 100644 --- a/tailbone/grids/filters.py +++ b/tailbone/grids/filters.py @@ -2,7 +2,7 @@ ################################################################################ # # Rattail -- Retail Software Framework -# Copyright © 2010-2018 Lance Edgar +# Copyright © 2010-2019 Lance Edgar # # This file is part of Rattail. # @@ -108,7 +108,10 @@ class EnumValueRenderer(ChoiceValueRenderer): """ def __init__(self, enum): - sorted_keys = sorted(enum, key=lambda k: enum[k].lower()) + if isinstance(enum, OrderedDict): + sorted_keys = list(enum.keys()) + else: + sorted_keys = sorted(enum, key=lambda k: enum[k].lower()) self.options = [tags.Option(enum[k], six.text_type(k)) for k in sorted_keys]