From 5563484ae8d6f97566b807c4ef7e66058a84d170 Mon Sep 17 00:00:00 2001 From: Roberto Rosario Date: Sat, 15 Aug 2015 23:42:32 -0400 Subject: [PATCH] Replace remaining usage of get_context_data that could be replaced with get_extra_context. --- mayan/apps/permissions/views.py | 30 ++++----- mayan/apps/tags/views.py | 24 ++++---- mayan/apps/user_management/views.py | 95 +++++++++++++---------------- 3 files changed, 66 insertions(+), 83 deletions(-) diff --git a/mayan/apps/permissions/views.py b/mayan/apps/permissions/views.py index b061fa8ecd..172a7ee70c 100644 --- a/mayan/apps/permissions/views.py +++ b/mayan/apps/permissions/views.py @@ -50,6 +50,12 @@ class SetupRoleMembersView(AssignRemoveView): group = get_object_or_404(Group, pk=item) self.get_object().groups.add(group) + def get_extra_context(self): + return { + 'object': self.get_object(), + 'title': _('Group members of role: %s') % self.get_object() + } + def get_object(self): return get_object_or_404(Role, pk=self.kwargs['pk']) @@ -67,15 +73,6 @@ class SetupRoleMembersView(AssignRemoveView): group = get_object_or_404(Group, pk=item) self.get_object().groups.remove(group) - def get_context_data(self, **kwargs): - data = super(SetupRoleMembersView, self).get_context_data(**kwargs) - data.update({ - 'object': self.get_object(), - 'title': _('Group members of role: %s') % self.get_object() - }) - - return data - class SetupRolePermissionsView(AssignRemoveView): grouped = True @@ -90,6 +87,12 @@ class SetupRolePermissionsView(AssignRemoveView): permission = get_object_or_404(StoredPermission, pk=item) self.get_object().permissions.add(permission) + def get_extra_context(self): + return { + 'object': self.get_object(), + 'title': _('Permissions for role: %s') % self.get_object(), + } + def get_object(self): return get_object_or_404(Role, pk=self.kwargs['pk']) @@ -124,15 +127,6 @@ class SetupRolePermissionsView(AssignRemoveView): permission = get_object_or_404(StoredPermission, pk=item) self.get_object().permissions.remove(permission) - def get_context_data(self, **kwargs): - data = super(SetupRolePermissionsView, self).get_context_data(**kwargs) - data.update({ - 'object': self.get_object(), - 'title': _('Permissions for role: %s') % self.get_object(), - }) - - return data - class RoleListView(SingleObjectListView): extra_context = { diff --git a/mayan/apps/tags/views.py b/mayan/apps/tags/views.py index 56b056ff91..13af4e7766 100644 --- a/mayan/apps/tags/views.py +++ b/mayan/apps/tags/views.py @@ -124,6 +124,8 @@ def tag_multiple_attach(request): class TagListView(SingleObjectListView): + object_permission = permission_tag_view + @staticmethod def get_document_count(instance, user): queryset = instance.documents @@ -137,18 +139,9 @@ class TagListView(SingleObjectListView): return queryset.count() - object_permission = permission_tag_view - - def get_tag_queryset(self): - return Tag.objects.all() - - def get_queryset(self): - self.queryset = self.get_tag_queryset() - return super(TagListView, self).get_queryset() - - def get_extra_context(self, **kwargs): + def get_extra_context(self): return { - 'extra_columns': [ + 'extra_columns': ( { 'name': _('Documents'), 'attribute': encapsulate( @@ -157,12 +150,19 @@ class TagListView(SingleObjectListView): ) ) }, - ], + ), 'hide_link': True, 'title': _('Tags'), } + def get_queryset(self): + self.queryset = self.get_tag_queryset() + return super(TagListView, self).get_queryset() + + def get_tag_queryset(self): + return Tag.objects.all() + def tag_delete(request, tag_id=None, tag_id_list=None): post_action_redirect = None diff --git a/mayan/apps/user_management/views.py b/mayan/apps/user_management/views.py index 871a27e4d4..783d8090a9 100644 --- a/mayan/apps/user_management/views.py +++ b/mayan/apps/user_management/views.py @@ -29,46 +29,41 @@ from .permissions import ( class UserListView(SingleObjectListView): view_permission = permission_user_view + def get_extra_context(self): + return { + 'extra_columns': ( + { + 'name': _('Full name'), + 'attribute': 'get_full_name' + }, + { + 'name': _('Email'), + 'attribute': 'email' + }, + { + 'name': _('Active'), + 'attribute': encapsulate( + lambda user: two_state_template(user.is_active) + ), + }, + { + 'name': _('Has usable password?'), + 'attribute': encapsulate( + lambda user: two_state_template( + user.has_usable_password() + ) + ), + }, + ), + 'hide_link': True, + 'title': _('Users'), + } + def get_queryset(self): return get_user_model().objects.exclude( is_superuser=True ).exclude(is_staff=True).order_by('last_name', 'first_name') - def get_context_data(self, **kwargs): - context = super(UserListView, self).get_context_data(**kwargs) - context.update( - { - 'title': _('Users'), - 'hide_link': True, - 'extra_columns': [ - { - 'name': _('Full name'), - 'attribute': 'get_full_name' - }, - { - 'name': _('Email'), - 'attribute': 'email' - }, - { - 'name': _('Active'), - 'attribute': encapsulate( - lambda user: two_state_template(user.is_active) - ), - }, - { - 'name': _('Has usable password?'), - 'attribute': encapsulate( - lambda user: two_state_template( - user.has_usable_password() - ) - ), - }, - ], - } - ) - - return context - def user_edit(request, user_id): Permission.check_permissions(request.user, (permission_user_edit,)) @@ -263,6 +258,12 @@ class UserGroupsView(AssignRemoveView): def add(self, item): item.user_set.add(self.get_object()) + def get_extra_context(self): + return { + 'object': self.get_object(), + 'title': _('Groups of user: %s') % self.get_object() + } + def get_object(self): return get_object_or_404(User, pk=self.kwargs['pk']) @@ -275,15 +276,6 @@ class UserGroupsView(AssignRemoveView): def remove(self, item): item.user_set.remove(self.get_object()) - def get_context_data(self, **kwargs): - data = super(UserGroupsView, self).get_context_data(**kwargs) - data.update({ - 'object': self.get_object(), - 'title': _('Groups of user: %s') % self.get_object() - }) - - return data - # Group views class GroupCreateView(SingleObjectCreateView): @@ -382,6 +374,12 @@ class GroupMembersView(AssignRemoveView): def add(self, item): self.get_object().user_set.add(item) + def get_extra_context(self): + return { + 'object': self.get_object(), + 'title': _('Members of group: %s') % self.get_object() + } + def get_object(self): return get_object_or_404(Group, pk=self.kwargs['pk']) @@ -393,12 +391,3 @@ class GroupMembersView(AssignRemoveView): def remove(self, item): self.get_object().user_set.remove(item) - - def get_context_data(self, **kwargs): - data = super(GroupMembersView, self).get_context_data(**kwargs) - data.update({ - 'object': self.get_object(), - 'title': _('Members of group: %s') % self.get_object() - }) - - return data