Merge branch 'dev' into feature-permissions

This commit is contained in:
Michael Shamoon committed 2023-01-24 14:10:45 -08:00
commit 44f860d9b0
49 files changed
+5354 -6219

No files matched your search

+1 -1
View File
@@ -201,7 +201,7 @@ class TagViewSet(ModelViewSet):
ObjectOwnedOrGrandtedPermissionsFilter,
)
filterset_class = TagFilterSet
ordering_fields = ("name", "matching_algorithm", "match", "document_count")
ordering_fields = ("color", "name", "matching_algorithm", "match", "document_count")
class DocumentTypeViewSet(ModelViewSet, PassUserMixin):