Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
thalia
concrexit
Commits
ac2763b9
Unverified
Commit
ac2763b9
authored
Feb 27, 2017
by
Thom Wiggers
📐
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Allow board into the bestuur wiki
parent
e61c16c3
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
25 additions
and
0 deletions
+25
-0
website/activemembers/migrations/0019_auto_20170227_1632.py
website/activemembers/migrations/0019_auto_20170227_1632.py
+19
-0
website/activemembers/models.py
website/activemembers/models.py
+3
-0
website/thaliawebsite/views.py
website/thaliawebsite/views.py
+3
-0
No files found.
website/activemembers/migrations/0019_auto_20170227_1632.py
0 → 100644
View file @
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'
),)},
),
]
website/activemembers/models.py
View file @
ac2763b9
...
...
@@ -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
View file @
ac2763b9
...
...
@@ -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
,
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment