Commit 5fdba335 authored by Sébastiaan Versteeg's avatar Sébastiaan Versteeg

Merge branch 'fix/wikinamespacesbestuur' into 'master'

Allow board into the bestuur wiki

Closes #342

See merge request !392
parents e61c16c3 ac2763b9
# -*- 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'),)},
),
]
......@@ -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),
......
......@@ -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,
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment