Merge branch 'fix/wikinamespacesbestuur' into 'master'

Allow board into the bestuur wiki

Closes #342

See merge request !392

website/activemembers/migrations/0019_auto_20170227_1632.py

+# -*- coding: utf-8 -*-
+# Generated by Django 1.10.5 on 2017-02-27 15:32
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('activemembers', '0018_merge_20170125_1452'),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name='board',
+            options={'ordering': ['-since'], 'permissions': (('board_wiki', 'Access the board wiki'),)},
+        ),
+    ]

website/activemembers/models.py

@@ -134,6 +134,9 @@ class Board(Committee):
 
     class Meta:
         ordering = ['-since']
+        permissions = (
+            ('board_wiki', _("Access the board wiki")),
+        )
 
     def get_absolute_url(self):
         return reverse('activemembers:board', args=[str(self.since.year),

website/thaliawebsite/views.py

@@ -51,6 +51,9 @@ def wiki_login(request):
         except Member.DoesNotExist:
             memberships = []
 
+        if user.has_perm('board_wiki'):
+            memberships.append('bestuur')
+
         return JsonResponse({'status': 'ok',
                              'name': user.get_full_name(),
                              'mail': user.email,