Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
thalia
concrexit
Commits
1a4a89ef
Unverified
Commit
1a4a89ef
authored
Jan 24, 2017
by
Joost Rijneveld
Browse files
Redirect menu board link to point to current board
parent
6ab9da8b
Changes
3
Hide whitespace changes
Inline
Side-by-side
website/activemembers/urls.py
View file @
1a4a89ef
...
...
@@ -14,4 +14,5 @@ urlpatterns = [
url
(
r
'^committees/(?P<id>\d+)/$'
,
views
.
committee_detail
,
name
=
'committee'
),
url
(
r
'^boards/$'
,
views
.
board_index
,
name
=
'boards'
),
url
(
r
'^boards/(?P<id>\d+)?$'
,
views
.
board_detail
,
name
=
'board'
),
url
(
r
'^board$'
,
views
.
current_board
,
name
=
'current-board'
),
]
website/activemembers/views.py
View file @
1a4a89ef
from
django.shortcuts
import
get_object_or_404
,
render
from
django.shortcuts
import
get_object_or_404
,
render
,
redirect
,
reverse
from
utils.translation
import
localize_attr_name
from
.models
import
Board
,
Committee
,
CommitteeMembership
...
...
@@ -62,3 +62,11 @@ def board_detail(request, id):
return
render
(
request
,
'activemembers/board_detail.html'
,
{
'board'
:
board
,
'members'
:
members
})
def
current_board
(
request
):
try
:
board
=
Board
.
objects
.
order_by
(
'-since'
)[
0
]
except
IndexError
:
return
redirect
(
reverse
(
'activemembers:boards'
))
return
redirect
(
board
.
get_absolute_url
())
website/thaliawebsite/menus.py
View file @
1a4a89ef
...
...
@@ -3,7 +3,7 @@ from django.utils.translation import ugettext_lazy as _
main
=
[
{
'title'
:
_
(
'Home'
),
'name'
:
'index'
},
{
'title'
:
_
(
'Association'
),
'name'
:
'association'
,
'submenu'
:
[
{
'title'
:
_
(
'Board'
),
'name'
:
'activemembers:board'
},
{
'title'
:
_
(
'Board'
),
'name'
:
'activemembers:
current-
board'
},
{
'title'
:
_
(
'Committees'
),
'name'
:
'activemembers:committees'
},
{
'title'
:
_
(
'Members'
),
'name'
:
'members:index'
},
{
'title'
:
_
(
'Documents'
),
'name'
:
'documents:index'
},
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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