Merge branch 'bug/committee-links' into 'master'

Clickable links to Achievements and Societies

Closes #828

See merge request !1160

website/activemembers/models.py

@@ -122,6 +122,18 @@ class MemberGroup(models.Model, metaclass=ModelTranslateMeta):
     def __str__(self):
         return self.name
 
+    def get_absolute_url(self):
+        try:
+            return self.board.get_absolute_url()
+        except self.DoesNotExist:
+            try:
+                return self.committee.get_absolute_url()
+            except self.DoesNotExist:
+                try:
+                    return self.society.get_absolute_url()
+                except self.DoesNotExist:
+                    pass
+
     class Meta:
         verbose_name = _('member group')
         verbose_name_plural = _('member groups')

website/members/services.py

@@ -39,6 +39,7 @@ def _member_group_memberships(member, skip_condition):
             data[name] = {
                 'name': name,
                 'periods': [period],
+                'url': membership.group.get_absolute_url(),
                 'earliest': membership.since,
             }
     return data

website/members/templates/members/profile.html

@@ -69,7 +69,11 @@
                     <ul class="list-unstyled">
                         {% for achievement in achievements %}
                             <li class="mb-1">
-                                <strong>{{ achievement.name }}</strong>
+                                <strong>
+                                        <a href="{{ achievement.url }}">
+                                            {{ achievement.name }}
+                                        </a>
+                                </strong>
                                 <br>
                                 {% for period in achievement.periods %}
                                     {% if period.role %}
@@ -94,7 +98,11 @@
                     <ul class="list-unstyled">
                         {% for society in societies %}
                             <li class="mb-1">
-                                <strong>{{ society.name }}</strong>
+                                <strong>
+                                    <a href="{{ society.url }}">
+                                        {{ society.name }}
+                                    </a>
+                                </strong>
                                 <br>
                                 {% for period in society.periods %}
                                     {% if period.role %}