Refactoring: users

Author: Pryanik0071

task_manager/tasks/filters.py

@@ -1,11 +1,26 @@
 import django_filters
 from django import forms
 from django.utils.translation import gettext_lazy as _
+from django.contrib.auth.models import User
 
 from .models import Task, Label
 
 
+class UserFullNameChoiceField(forms.ModelChoiceField):
+    def label_from_instance(self, obj):
+        return f"{obj.first_name} {obj.last_name}"
+
+
+class UserFullNameModelChoiceFilter(django_filters.ModelChoiceFilter):
+      field_class = UserFullNameChoiceField
+
+
 class TaskFilter(django_filters.FilterSet):
+    executor = UserFullNameModelChoiceFilter(
+        queryset=User.objects.all().order_by('id'),
+        label=_("Executor")
+    )
+
     labels = django_filters.ModelChoiceFilter(
         queryset=Label.objects.all(),
         label=_('Label')
@@ -24,4 +39,4 @@ def get_self_tasks(self, queryset, name, value):
 
     class Meta:
         model = Task
-        fields = ['status', 'executor']
+        fields = ['status']

task_manager/users/views.py

@@ -12,7 +12,7 @@
 class IndexView(View):
 
     def get(self, request, *args, **kwargs):
-        users = User.objects.all()
+        users = User.objects.all().order_by('id')
         return render(request, 'users/index.html', context={
             'users': users,
         })