From 279350f851ffb32f3580b9547f4b2c862290cd5d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20P=C3=A9ters?= <fpeters@entrouvert.com>
Date: Wed, 21 Nov 2018 11:00:13 +0100
Subject: [PATCH] misc: change sorting on category/formdef/role names ignore
 accents (#28170)

---
 wcs/admin/categories.py | 3 +--
 wcs/admin/roles.py      | 3 +--
 wcs/qommon/storage.py   | 5 +++++
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/wcs/admin/categories.py b/wcs/admin/categories.py
index 57a8f578e..f5856f471 100644
--- a/wcs/admin/categories.py
+++ b/wcs/admin/categories.py
@@ -85,9 +85,8 @@ class CategoryPage(Directory):
             r += self.category.get_description_html_text(editable=False)
             r += htmltext('</div>')
 
-        formdefs = FormDef.select()
+        formdefs = FormDef.select(order_by='name')
         formdefs = [x for x in formdefs if x.category_id == self.category.id]
-        formdefs.sort(lambda x,y: cmp(x.name, y.name))
         r += htmltext('<div class="bo-block">')
         r += htmltext('<h3>%s</h3>') % _('Forms in this category')
         r += htmltext('<ul>')
diff --git a/wcs/admin/roles.py b/wcs/admin/roles.py
index 5e2744388..ee46e32a3 100644
--- a/wcs/admin/roles.py
+++ b/wcs/admin/roles.py
@@ -121,8 +121,7 @@ class RolePage(Directory):
         # list forms in two columns,
         #  - 1 forms where this role is affected by the workflow
         #  - 2 forms where the sender is this role
-        formdefs = FormDef.select()
-        formdefs.sort(lambda x,y: cmp(x.name, y.name))
+        formdefs = FormDef.select(order_by='name')
         workflow_formdefs = [x for x in formdefs if x.is_of_concern_for_role_id(self.role.id)]
         sender_formdefs = [x for x in formdefs if self.role.id in (x.roles or [])]
 
diff --git a/wcs/qommon/storage.py b/wcs/qommon/storage.py
index aa7c481ae..1ba94f2c9 100644
--- a/wcs/qommon/storage.py
+++ b/wcs/qommon/storage.py
@@ -265,6 +265,11 @@ class StorableObject(object):
             objects = list(objects)
             if order_by == 'id':
                 cmp_function = lambda x, y: cmp(lax_int(x.id), lax_int(y.id))
+            elif order_by == 'name':
+                # proper collation should be done but it's messy to get working
+                # on all systems so we go the cheap and almost ok way.
+                from .misc import simplify
+                cmp_function = lambda x, y: cmp(simplify(x.name), simplify(y.name))
             else:
                 cmp_function = lambda x, y: cmp(getattr(x, order_by), getattr(y, order_by))
             objects.sort(cmp_function)
-- 
2.19.1