Skip to content
GitLab
Menu
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
62b07814
Verified
Commit
62b07814
authored
Oct 31, 2018
by
Sébastiaan Versteeg
Browse files
Add benefactors tab to members
parent
bf666595
Changes
4
Hide whitespace changes
Inline
Side-by-side
website/members/locale/nl/LC_MESSAGES/django.mo
View file @
62b07814
No preview for this file type
website/members/locale/nl/LC_MESSAGES/django.po
View file @
62b07814
...
...
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2018-10-
25 20:13
+0
2
00\n"
"PO-Revision-Date: 2018-10-
25
00:
01
+0
2
00\n"
"POT-Creation-Date: 2018-10-
31 00:27
+0
1
00\n"
"PO-Revision-Date: 2018-10-
31
00:
27
+0
1
00\n"
"Last-Translator: Thom Wiggers <thom@thomwiggers.nl>\n"
"Language-Team: \n"
"Language: nl\n"
...
...
@@ -951,6 +951,10 @@ msgstr "Zoeken"
msgid "All members"
msgstr "Alle leden"
#: templates/members/index.html
msgid "Benefactors"
msgstr "Begunstigers"
#: templates/members/index.html
msgid "Honorary Members"
msgstr "Ere-leden"
...
...
website/members/templates/members/index.html
View file @
62b07814
...
...
@@ -44,27 +44,35 @@
{% endfor %}
<li
class=
"nav-item"
>
<a
class=
"nav-link{% if filter == "
old
"
%}
active
{%
endif
%}"
href=
"{% url 'members:index' %}?filter=old{% if keywords %}&keywords={{ keys }}{% endif %}{% if page %}&page={{ page }}{% endif %}#members-directory"
>
href=
"{% url 'members:index' %}?filter=old
er
{% if keywords %}&keywords={{ keys }}{% endif %}{% if page %}&page={{ page }}{% endif %}#members-directory"
>
{% trans "Older" %}
</a>
</li>
<li
class=
"nav-item"
>
<a
class=
"nav-link{% if filter == "
benefactors
"
%}
active
{%
endif
%}"
href=
"{% url 'members:index' %}?filter=benefactors{% if keywords %}&keywords={{ keys }}{% endif %}{% if page %}&page={{ page }}{% endif %}#members-directory"
>
{% trans "Benefactors" %}
</a>
</li>
<li
class=
"nav-item"
>
<a
class=
"nav-link{% if filter == "
honor
"
%}
active
{%
endif
%}"
href=
"{% url 'members:index' %}?filter=honor{% if keywords %}&keywords={{ keys }}{% endif %}{% if page %}&page={{ page }}{% endif %}#members-directory"
>
href=
"{% url 'members:index' %}?filter=honor
ary
{% if keywords %}&keywords={{ keys }}{% endif %}{% if page %}&page={{ page }}{% endif %}#members-directory"
>
{% trans "Honorary Members" %}
</a>
</li>
<li
class=
"nav-item"
>
<a
class=
"nav-link{% if filter == "
ex
"
%}
active
{%
endif
%}"
href=
"{% url 'members:index' %}?filter=
ex
{% if keywords %}&keywords={{ keys }}{% endif %}{% if page %}&page={{ page }}{% endif %}#members-directory"
>
href=
"{% url 'members:index' %}?filter=
former
{% if keywords %}&keywords={{ keys }}{% endif %}{% if page %}&page={{ page }}{% endif %}#members-directory"
>
{% trans "Former Members" %}
</a>
</li>
</ul>
{% if not members %}
{% trans 'No members found' as info_text %}
{% alert 'info' info_text dismissable=True %}
<div
class=
"mt-4"
>
{% trans 'No members found' as info_text %}
{% alert 'info' info_text dismissable=False %}
</div>
{% else %}
<div
class=
"row mt-4"
>
{% for member in members %}
...
...
website/members/views.py
View file @
62b07814
...
...
@@ -43,17 +43,22 @@ def filter_users(tab, keywords, year_range):
if
tab
and
tab
.
isdigit
():
members_query
&=
Q
(
profile__starting_year
=
int
(
tab
))
elif
tab
==
'old'
:
memberships_query
&=
Q
(
type
=
Membership
.
MEMBER
)
elif
tab
==
'older'
:
members_query
&=
Q
(
profile__starting_year__lt
=
year_range
[
-
1
])
elif
tab
==
'ex'
:
memberships_query
&=
Q
(
type
=
Membership
.
MEMBER
)
elif
tab
==
'former'
:
# Filter out all current active memberships
memberships_query
&=
Q
(
type
=
'member'
)
|
Q
(
type
=
'honorary'
)
memberships_query
&=
(
Q
(
type
=
Membership
.
MEMBER
)
|
Q
(
type
=
Membership
.
HONORARY
))
memberships
=
models
.
Membership
.
objects
.
filter
(
memberships_query
)
members_query
&=
~
Q
(
pk__in
=
memberships
.
values
(
'user__pk'
))
# Members_query contains users that are not currently (honorary)member
elif
tab
==
'honor'
:
elif
tab
==
'benefactors'
:
memberships_query
&=
Q
(
type
=
Membership
.
BENEFACTOR
)
elif
tab
==
'honorary'
:
memberships_query
=
Q
(
until__gt
=
datetime
.
now
().
date
())
|
Q
(
until
=
None
)
memberships_query
&=
Q
(
type
=
'honorary'
)
memberships_query
&=
Q
(
type
=
Membership
.
HONORARY
)
if
keywords
:
for
key
in
keywords
:
...
...
@@ -65,8 +70,9 @@ def filter_users(tab, keywords, year_range):
Q
(
last_name__icontains
=
key
)
|
Q
(
username__icontains
=
key
))
if
tab
==
'ex'
:
memberships_query
=
Q
(
type
=
'member'
)
|
Q
(
type
=
'honorary'
)
if
tab
==
'former'
:
memberships_query
=
(
Q
(
type
=
Membership
.
MEMBER
)
|
Q
(
type
=
Membership
.
HONORARY
))
memberships
=
models
.
Membership
.
objects
.
filter
(
memberships_query
)
all_memberships
=
models
.
Membership
.
objects
.
all
()
# Only keep members that were once members, or are legacy users that
...
...
Write
Preview
Supports
Markdown
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