Merge branch 'feature/new-concordances' of github.com:UCL/frrant into…

… feature/new-concordances

src/rard/research/models/concordance.py

@@ -18,7 +18,7 @@ def get_queryset(self):
                     default=Value(False),
                 )
             )
-            .order_by("-is_template", "edition__name", "value")
+            .order_by("-is_template", "edition__name", "display_order")
         )
 
 
@@ -33,7 +33,9 @@ def __str__(self):
 
     edition = models.ForeignKey("Edition", on_delete=models.CASCADE)
     value = models.CharField(max_length=250, blank=False)
-    display_order = models.CharField(max_length=30, blank=True)
+    display_order = models.CharField(
+        max_length=30, blank=True
+    )  # Name for ordering purposes
 
 
 class Edition(HistoryModelMixin, BaseModel):
@@ -107,7 +109,7 @@ def works(self):
     @staticmethod
     def get_ordered_queryset(queryset):
         return queryset.order_by(
-            "identifier",
+            "identifier__display_order",
             Case(
                 When(content_type="T", then=0),
                 When(content_type="F", then=1),

src/rard/research/views/concordance.py

@@ -127,21 +127,18 @@ def get_queryset(self, *args, **kwargs):
                 ]
                 results_qs = {"frrant": results, "concordances": filtered_concordances}
 
-        elif edition_pk or identifier_pk:
+        elif edition_pk:
             # also sort by this rather than by the frrant thing
             self.sort_by_antiquarian = False
-            # todo:
             if edition_pk:
                 results_qs = ConcordanceModel.get_ordered_queryset(
-                    queryset.filter(identifier__edition=edition_pk).order_by(
-                        "identifier__display_order"
-                    )
+                    queryset.filter(identifier__edition=edition_pk)
                 )
-                if identifier_pk:
+                if (
+                    identifier_pk
+                ):  # Identifier should not be an option without an edition
                     results_qs = ConcordanceModel.get_ordered_queryset(
-                        queryset.filter(identifier=identifier_pk).order_by(
-                            "identifier__display_order"
-                        )
+                        queryset.filter(identifier=identifier_pk)
                     )
         else:
             results_qs = queryset.none()