Commit 3eb13d69 authored by Joost Rijneveld's avatar Joost Rijneveld
Browse files

Merge branch 'feature/only-show-ex-members' into 'master'

Fix style issue on member pages and change ex-members filter

Closes #32

See merge request !72
parents d1325947 9087cbef
......@@ -39,7 +39,8 @@ def index(request):
obj.current_membership and
obj.current_membership.since.year < start_year]
elif query_filter == 'ex':
members = [obj for obj in members if not obj.current_membership]
members = [obj for obj in members if not obj.current_membership and
obj.membership_set.filter(type='member').count() > 0]
elif query_filter == 'honor':
members = [obj for obj in members if
obj.current_membership and
......
......@@ -1952,8 +1952,10 @@ body {
.alert-success1 {
background-color: #1eb0bc;
}
.alert-success2 {
background-color: #9c9c9c;
border-color: #8a8a8a;
}
.close {
......@@ -3045,6 +3047,9 @@ body {
}
.member-search {
width: 400px;
margin: 0 auto;
input {
float: left;
display: inline;
......
Supports Markdown
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