From b085d6295c71e5a0f49d9d630d47994452d3caf9 Mon Sep 17 00:00:00 2001 From: Arthur Gerbaud Date: Tue, 15 Nov 2016 15:51:23 +0100 Subject: [PATCH] clean up some messy code --- maraudes/views.py | 1 + website/decorators.py | 16 ++++++---------- 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/maraudes/views.py b/maraudes/views.py index e97828e..3c5fd27 100644 --- a/maraudes/views.py +++ b/maraudes/views.py @@ -145,6 +145,7 @@ class CompteRenduCreateView(generic.DetailView): def __init__(self, *args, **kwargs): super().__init__(*args, **kwargs) + # Overrides app_menu and replace it self.app_menu = ["compte_rendu/menu_creation.html"] def get_forms(self, *args, initial=None): diff --git a/website/decorators.py b/website/decorators.py index c1420bf..128a983 100644 --- a/website/decorators.py +++ b/website/decorators.py @@ -10,14 +10,10 @@ def webpage(**options): -- ajax : view will return content_template for Ajax requests -- permissions : list of permissions needed to access view """ - try: ajax = options.pop('ajax') - except KeyError: ajax = False - try: permissions = options.pop('permissions') - except KeyError: permissions = [] - try: app_menu = options.pop('app_menu') - except KeyError: app_menu = [] - try: app_name = options.pop('app_name') - except KeyError: app_name = None + ajax = options.pop('ajax', False) + permissions = options.pop('permissions', []) + app_menu = options.pop('app_menu', []) + app_name = options.pop('app_name', None) new_bases = [] if ajax: @@ -27,7 +23,7 @@ def webpage(**options): if permissions: new_bases.append(PermissionRequiredMixin) - def update_class(cls): + def class_decorator(cls): _insert_bases(cls, new_bases) if permissions: cls.permissions = permissions @@ -35,4 +31,4 @@ def webpage(**options): cls.app_name = app_name return cls - return update_class + return class_decorator