Merge branch 'fix/birthdaycalendar' into 'master'

Fix birthday calendar



See merge request !143

website/members/api/serializers.py

@@ -29,7 +29,7 @@ class MemberBirthdaySerializer(CalenderJSSerializer):
     def _description(self, instance):
         membership = instance.current_membership
         if membership and membership.type == 'honorary':
-            return instance.membership.get_type_display()
+            return membership.get_type_display()
         return ''
 
     def _background_color(self, instance):

website/members/api/viewsets.py

@@ -44,7 +44,6 @@ class MemberViewset(viewsets.ViewSet):
             .with_birthdays_in_range(start, end)
             .filter(show_birthday=True)
         )
-        queryset.prefetch_related('membership_get')
 
         all_birthdays = [
             self._get_birthdays(m, start, end)