Merge pull request #180 from somewes/feature/membership-types

order by sort order and id
ambitioninc · Oct 31, 2023 · 5248804 · 5248804
2 parents dce797f + e1a9146
commit 5248804
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/entity/models.py b/entity/models.py
@@ -338,7 +338,7 @@ def get_membership_cache(self, group_ids=None, is_active=True):
         if group_ids:
             membership_queryset = membership_queryset.filter(entity_group_id__in=group_ids)
 
-        membership_queryset = membership_queryset.order_by('id')
+        membership_queryset = membership_queryset.order_by('sort_order', 'id')
 
         membership_queryset = membership_queryset.values_list('entity_group_id', 'entity_id', 'sub_entity_kind_id')