Skip to content

Commit 13e09ff

Browse files
committed
Correct the ordering as livelihood_zone__code still performs less and livelihood_zone_code isnt known as native fk to the models see HEA-996
1 parent eafc295 commit 13e09ff

1 file changed

Lines changed: 6 additions & 3 deletions

File tree

apps/baseline/viewsets.py

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -419,10 +419,9 @@ class WealthGroupViewSet(BaseModelViewSet):
419419
serializer_class = WealthGroupSerializer
420420
filterset_class = WealthGroupFilterSet
421421
ordering = [
422-
"livelihood_zone_baseline__livelihood_zone__code",
422+
"livelihood_zone_baseline__livelihood_zone_id",
423423
"livelihood_zone_baseline__reference_year_end_date",
424424
"wealth_group_category__ordering",
425-
"community__name",
426425
]
427426

428427

@@ -874,14 +873,18 @@ class LivelihoodStrategyViewSet(BaseModelViewSet):
874873
)
875874
serializer_class = LivelihoodStrategySerializer
876875
filterset_class = LivelihoodStrategyFilterSet
876+
ordering = [
877+
"livelihood_zone_baseline_id",
878+
"strategy_type",
879+
]
877880
search_fields = [
878881
"additional_identifier",
879882
"strategy_type",
880883
]
881884

882885

883886
LIVELIHOOD_ACTIVITY_ORDER_BY = [
884-
"livelihood_zone_baseline__livelihood_zone__code",
887+
"livelihood_zone_baseline__livelihood_zone_id",
885888
"livelihood_zone_baseline__reference_year_end_date",
886889
]
887890

0 commit comments

Comments
 (0)