`f34b2eb`

sort complete index alphabetically isntead of by class year

Authored by

espadonne 6 months ago

Status	File	+	-
M	`memorial/views.py`	3	12

memorial/views.pymodified

          if conflict_id is not None:
              queryset = queryset.filter(conflict_id=conflict_id)
 -            return queryset.extra(
 -                select={'class_year_null': 'class_year IS NULL'},
 -                order_by=['class_year_null', 'class_year', 'last_name', 'first_name']
 -            )
 +            return queryset.order_by('last_name', 'first_name')
          order_by = self.request.query_params.get('order_by', 'name')
                  except ValueError:
                      pass
 -        queryset = queryset.extra(
 -            select={'class_year_null': 'class_year IS NULL'},
 -            order_by=['class_year_null', 'class_year', 'last_name', 'first_name']
 -        )
 +        queryset = queryset.order_by('last_name', 'first_name')
          serializer = PersonDetailSerializer(queryset, many=True)
          return Response({
      data = []
      for conflict in conflicts:
 -        casualties = Person.objects.filter(conflict=conflict).extra(
 -            select={'class_year_null': 'class_year IS NULL'},
 -            order_by=['class_year_null', 'class_year', 'last_name', 'first_name']
 -        )
 +        casualties = Person.objects.filter(conflict=conflict).order_by('last_name', 'first_name')
          conflict_data = ConflictSerializer(conflict).data
          conflict_data['casualties'] = PersonDetailSerializer(casualties, many=True).data
          data.append(conflict_data)