Merge branch 'fix/societies-new-template' into 'master'

Fix societies pages

See merge request !974

website/activemembers/models.py

@@ -107,9 +107,6 @@ class MemberGroup(models.Model, metaclass=ModelTranslateMeta):
     def __str__(self):
         return self.name
 
-    def get_absolute_url(self):
-        return reverse('activemembers:committee', args=[str(self.pk)])
-
     class Meta:
         verbose_name = _('member group')
         verbose_name_plural = _('member groups')
@@ -128,6 +125,9 @@ class Committee(MemberGroup):
         blank=True,
         max_length=50)
 
+    def get_absolute_url(self):
+        return reverse('activemembers:committee', args=[str(self.pk)])
+
     class Meta:
         verbose_name = _('committee')
         verbose_name_plural = _('committees')
@@ -140,6 +140,9 @@ class Society(MemberGroup):
     objects = models.Manager()
     active_objects = ActiveMemberGroupManager()
 
+    def get_absolute_url(self):
+        return reverse('activemembers:society', args=[str(self.pk)])
+
     class Meta:
         verbose_name = _('society')
         verbose_name_plural = _('societies')

website/activemembers/templates/activemembers/society_detail.html

-{% extends "base.html" %}
+{% extends "activemembers/membergroup_detail.html" %}
 {% load i18n %}
 
 {% block title %}{{ membergroup.name }} — {% trans 'Societies' %} — {{ block.super }}{% endblock %}

website/activemembers/templatetags/activemembers_cards.py

@@ -11,7 +11,7 @@ register = template.Library()
 
 @register.inclusion_tag('includes/grid_item.html')
 def membergroup_card(group):
-    image_url = static('activemembers/images/placeholder.png')
+    image_url = static('activemembers/images/placeholder_overview.png')
     if group.photo:
         image_url = thumbnail(group.photo, '220x220')
 

website/activemembers/views.py

@@ -125,14 +125,14 @@ def society_detail(request, pk):
                    .filter(group=society)
                    .prefetch_related('member__membergroupmembership_set'))
     members = [{
-        'profile': x.member.profile,
+        'member': x.member,
         'chair': x.chair,
         'role': x.role,
         'since': x.initial_connected_membership.since
     } for x in memberships]
 
-    members.sort(key=lambda x: x['member_since'])
+    members.sort(key=lambda x: x['since'])
 
     return render(request, 'activemembers/society_detail.html',
-                  {'committee': society,
+                  {'membergroup': society,
                    'members': members})