From 25ba697eb2a7d056b72fcdd52ccf32b0085e408e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20P=C3=A9ters?= Date: Sun, 8 Nov 2015 11:31:22 +0100 Subject: [PATCH 1/3] backoffice: refactor display of submission listing screen (#8913) --- wcs/backoffice/submission.py | 24 ++++++++++-------------- 1 file changed, 10 insertions(+), 14 deletions(-) diff --git a/wcs/backoffice/submission.py b/wcs/backoffice/submission.py index e23059c..3da4390 100644 --- a/wcs/backoffice/submission.py +++ b/wcs/backoffice/submission.py @@ -133,20 +133,16 @@ class SubmissionDirectory(Directory): cats = Category.select() Category.sort_by_position(cats) - one = False - for c in cats: - l2 = [x for x in list_forms if str(x.category_id) == str(c.id)] - if l2: - r += self.form_list(l2, title=c.name) - one = True - - l2 = [x for x in list_forms if not x.category] - if l2: - if one: - title = _('Misc') - else: - title = None - r += self.form_list(l2, title=title) + for cat in cats: + cat.formdefs = [x for x in list_forms if str(x.category_id) == str(cat.id)] + misc_cat = Category(name=_('Misc')) + misc_cat.formdefs = [x for x in list_forms if not x.category] + cats.append(misc_cat) + + for cat in cats: + if not cat.formdefs: + continue + r += self.form_list(cat.formdefs, title=cat.name) return r.getvalue() -- 2.6.2