From 4a8931ef61a798a2b87bcc4a84c97580fce85b8c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20P=C3=A9ters?= Date: Tue, 19 Oct 2021 20:32:08 +0200 Subject: [PATCH] categories: remove duplicated category code (#57965) --- auquotidien/modules/categories_admin.py | 36 +++---------------------- 1 file changed, 3 insertions(+), 33 deletions(-) diff --git a/auquotidien/modules/categories_admin.py b/auquotidien/modules/categories_admin.py index f53863b..dd246fe 100644 --- a/auquotidien/modules/categories_admin.py +++ b/auquotidien/modules/categories_admin.py @@ -28,11 +28,6 @@ import wcs.admin.categories class CategoryUI(wcs.admin.categories.CategoryUI): - def __init__(self, category): - self.category = category - if self.category is None: - self.category = Category() - def get_form(self, **kwargs): form = super().get_form(**kwargs) homepage_redirect_url = get_cfg('misc', {}).get('homepage-redirect-url') @@ -69,35 +64,10 @@ class CategoryUI(wcs.admin.categories.CategoryUI): class CategoryPage(wcs.admin.categories.CategoryPage): - def __init__(self, component): - self.category = Category.get(component) - self.category_ui = CategoryUI(self.category) - get_response().breadcrumb.append((component + '/', self.category.name)) + category_ui_class = CategoryUI class CategoriesDirectory(wcs.admin.categories.CategoriesDirectory): label = N_('Categories') - - def new(self): - get_response().breadcrumb.append(('new', _('New'))) - category_ui = CategoryUI(None) - form = category_ui.get_form() - if form.get_widget('cancel').parse(): - return redirect('.') - - if form.is_submitted() and not form.has_errors(): - try: - category_ui.submit_form(form) - except ValueError: - pass - else: - return redirect('.') - - html_top('categories', title=_('New Category')) - r = TemplateIO(html=True) - r += htmltext('

%s

') % _('New Category') - r += form.render() - return r.getvalue() - - def _q_lookup(self, component): - return CategoryPage(component) + category_ui_class = CategoryUI + category_page_class = CategoryPage