Merge pull request #543 from christophmeissner/fix/541-fix-ordering-i…

…n-scheduletemplatemanager Fix bug in ShiftTemplateManager
coders4help · Apr 1, 2022 · fdf4df9 · fdf4df9
2 parents 8728952 + b24be87
commit fdf4df9
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/scheduletemplates/managers.py b/scheduletemplates/managers.py
@@ -1,5 +1,6 @@
 # coding: utf-8
 from django.db import models
+from django.db.models import F
 
 
 class ShiftTemplateManager(models.Manager):
@@ -16,8 +17,8 @@ def get_queryset(self):
 
         qs = qs.order_by(
             "schedule_template",
-            "task",
-            "workplace",
+            F("task__priority").desc(nulls_last=True),
+            F("workplace__priority").desc(nulls_last=True),
             "starting_time",
             "-days",
             "-ending_time",