From e4a54eca1875876611e3e24ae59e550f74ebeb2d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20P=C3=A9ters?= Date: Thu, 14 Jan 2016 11:35:57 +0100 Subject: [PATCH] backoffice: use default columns when they're all turned off (#9653) --- wcs/backoffice/management.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/wcs/backoffice/management.py b/wcs/backoffice/management.py index f08e8c5..2ad414a 100644 --- a/wcs/backoffice/management.py +++ b/wcs/backoffice/management.py @@ -977,9 +977,9 @@ class FormPage(Directory): return fields - def get_fields_from_query(self): + def get_fields_from_query(self, ignore_form=False): field_ids = [x for x in get_request().form.keys()] - if not field_ids: + if not field_ids or ignore_form: field_ids = ['id', 'time', 'user-label'] for field in self.formdef.fields: if hasattr(field, str('get_view_value')) and field.in_listing: @@ -991,6 +991,9 @@ class FormPage(Directory): if field.id in field_ids: fields.append(field) + if not fields: + return self.get_fields_from_query(ignore_form=True) + return fields def get_filter_from_query(self, default='pending'): -- 2.7.0.rc3