Refactoring abonapp.views.grouplist from function view to ClassBasedView

abonapp/templates/abonapp/group_list.html

@@ -2,7 +2,6 @@
 {% load i18n %}
 {% block main %}
 
-
     <ol class="breadcrumb">
         <li><span class="glyphicon glyphicon-home"></span></li>
         <li class="active">{% trans 'User groups' %}</li>
@@ -18,7 +17,7 @@
             <tr>
                 <th width="50">#</th>
                 <th>
-                    <a href="{% url 'abonapp:group_list' %}?order_by=title&dir={{ dir|default:"down" }}">
+                    <a href="{% url 'abonapp:group_list' %}?order_by=title&dir={{ dir|default:'down' }}">
                         {% trans 'Group title' %}
                     </a>
                     {% if order_by == 'title' %}<span class="glyphicon glyphicon-filter"></span>{% endif %}
@@ -84,6 +83,6 @@
         </table>
     </div>
 
-    {% include 'toolbar_page.html' with pag=groups %}
+    {% include 'toolbar_page_cbv.html' %}
 
 {% endblock %}

abonapp/urls.py

@@ -7,7 +7,7 @@ app_name = 'abonapp'
 
 urlpatterns = [
 
-    url(r'^$', views.grouplist, name='group_list'),
+    url(r'^$', views.GroupListView.as_view(), name='group_list'),
     url(r'^addgroup$', views.addgroup, name='add_group'),
     url(r'^delgroup', views.delgroup, name='del_group'),
 

abonapp/views.py

@@ -33,12 +33,15 @@ PAGINATION_ITEMS_PER_PAGE = getattr(settings, 'PAGINATION_ITEMS_PER_PAGE', 10)
 
 
 @method_decorator([login_required, mydefs.only_admins], name='dispatch')
-class PeoplesListView(ListView, OrderingMixin):
-    context_object_name = 'peoples'
-    template_name = 'abonapp/peoples.html'
+class BaseAbonListView(ListView, OrderingMixin):
     paginate_by = PAGINATION_ITEMS_PER_PAGE
     http_method_names = ['get']
 
+
+class PeoplesListView(BaseAbonListView):
+    context_object_name = 'peoples'
+    template_name = 'abonapp/peoples.html'
+
     def get_queryset(self):
         street_id = mydefs.safe_int(self.request.GET.get('street'))
         gid = mydefs.safe_int(self.kwargs.get('gid'))
@@ -102,24 +105,16 @@ def addgroup(request):
     })
 
 
-@login_required
-@mydefs.only_admins
-def grouplist(request):
-    groups = models.AbonGroup.objects.annotate(usercount=Count('abon')).order_by('title')
-    groups = get_objects_for_user(request.user, 'abonapp.can_view_abongroup', klass=groups, accept_global_perms=False)
-
-    # фильтр
-    directory, field = mydefs.order_helper(request)
-    if field:
-        groups = groups.order_by(field)
+class GroupListView(BaseAbonListView):
+    context_object_name = 'groups'
+    template_name = 'abonapp/group_list.html'
+    queryset = models.AbonGroup.objects.annotate(usercount=Count('abon')).order_by('title')
 
-    groups = mydefs.pag_mn(request, groups)
-
-    return render(request, 'abonapp/group_list.html', {
-        'groups': groups,
-        'dir': directory,
-        'order_by': request.GET.get('order_by')
-    })
+    def get_queryset(self):
+        queryset = super(GroupListView, self).get_queryset()
+        queryset = get_objects_for_user(self.request.user, 'abonapp.can_view_abongroup', klass=queryset,
+                                        accept_global_perms=False)
+        return queryset
 
 
 @login_required