diff --git a/apps/api/views.py b/apps/api/views.py index a477fc5..a3f5151 100644 --- a/apps/api/views.py +++ b/apps/api/views.py @@ -47,7 +47,7 @@ class TicketListApiView(generics.ListAPIView): pagination_class = TicketPaginiation serializer_class = TicketSerializer - queryset = Ticket.objects.all() + # queryset = Ticket.objects.all() filter_backends = [filters.SearchFilter, rest_filters.DjangoFilterBackend, filters.OrderingFilter] filterset_fields = ["uuid", "priority", "tags", "author", "author__department"] @@ -55,12 +55,16 @@ class TicketListApiView(generics.ListAPIView): ordering_fields = ["create_timestamp", "edit_timestamp"] def get_queryset(self): + if self.request.user.is_superuser: + queryset=Ticket.objects.all() + else: + queryset = Ticket.objects.filter(author=self.request.user) + strict_tags = self.request.query_params.get("strict-tags") if not strict_tags: - return self.queryset + return queryset tag_uuids = self.request.query_params.getlist("tags", []) - queryset = self.queryset log.debug("tag uuids %s", tag_uuids) @@ -77,7 +81,11 @@ class FilterCountListApiView(generics.ListAPIView): permission_classes = [permissions.IsAuthenticated] def get(self, request): - self._tickets = Ticket.objects.all() + if self.request.user.is_superuser: + self._tickets = Ticket.objects.all() + else: + self._tickets = Ticket.objects.filter(author=self.request.user) + data = {"tickets": self._tickets.count()} self._fill_data(TicketPriority, data, "priority") diff --git a/apps/authentication/views.py b/apps/authentication/views.py index d95784c..ea15a12 100644 --- a/apps/authentication/views.py +++ b/apps/authentication/views.py @@ -39,9 +39,9 @@ def register_user(request): user = form.save(commit=False) # Develepment, give all new users admin - user.is_staff = True - user.is_superuser = True - user.save() + # user.is_staff = True + # user.is_superuser = True + # user.save() email = form.cleaned_data.get("email") raw_password = form.cleaned_data.get("password1") diff --git a/apps/templates/home/tickets.html b/apps/templates/home/tickets.html index 297024a..1e1fe92 100644 --- a/apps/templates/home/tickets.html +++ b/apps/templates/home/tickets.html @@ -5,340 +5,322 @@ {% block stylesheets %} - + {% endblock stylesheets %} {% block content %} -
+
-
+