fix filtering

egourlao · Aug 6, 2016 · 3144ffd · 3144ffd
1 parent 7758795
commit 3144ffd
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 5 deletions.
diff --git a/facture/views.py b/facture/views.py
@@ -20,9 +20,11 @@
 
 class FactureRecueViewSet(viewsets.ModelViewSet):
 
-    queryset = facture_models.FactureRecue.objects.all()
     serializer_class = facture_serializers.FactureRecueSerializer
     permission_classes = (IsAdmin,)
+    def get_queryset(self):
+        qs = facture_models.FactureRecue.objects
+        return core_models.Semestre.filter_queryset(qs, self.request)
 
 
 class CategorieFactureRecueViewSet(viewsets.ModelViewSet):
@@ -34,10 +36,12 @@ class CategorieFactureRecueViewSet(viewsets.ModelViewSet):
 
 class FactureEmiseViewSet(core_viewsets.RetrieveSingleInstanceModelViewSet):
 
-    queryset = facture_models.FactureEmise.objects.all()
     single_serializer_class = facture_serializers.FactureEmiseWithRowsSerializer
     serializer_class = facture_serializers.FactureEmiseSerializer
     permission_classes = (IsAdmin,)
+    def get_queryset(self):
+        qs = facture_models.FactureEmise.objects
+        return core_models.Semestre.filter_queryset(qs, self.request)
 
 
 class FactureEmiseRowViewSet(viewsets.ModelViewSet):

diff --git a/perm/views.py b/perm/views.py
@@ -53,7 +53,6 @@ class PermViewSet(core_viewsets.RetrieveSingleInstanceModelViewSet):
     serializer_class = perm_serializers.PermSerializer
     single_serializer_class = perm_serializers.PermWithArticleSerializer
     permission_classes = (IsAuthorizedUser,)
-    # queryset = perm_models.Perm.objects.all()
     def get_queryset(self):
         qs = perm_models.Perm.objects
         return core_models.Semestre.filter_queryset(qs, self.request)

diff --git a/picsous/router.py b/picsous/router.py
@@ -47,8 +47,8 @@
 router.register(r'articlesAdmin', perm_views.ArticleAdminViewSet)
 
 # Factures
-router.register(r'facturesRecues', facture_views.FactureRecueViewSet)
+router.register(r'facturesRecues', facture_views.FactureRecueViewSet, base_name='picsous-facturesrecues')
 router.register(r'categoriesFactureRecue', facture_views.CategorieFactureRecueViewSet)
-router.register(r'factureEmises', facture_views.FactureEmiseViewSet)
+router.register(r'factureEmises', facture_views.FactureEmiseViewSet, base_name='picsous-factureemises')
 router.register(r'factureEmiseRows', facture_views.FactureEmiseRowViewSet)
 router.register(r'cheques', facture_views.ChequeViewSet)