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
f8762f2e
Unverified
Commit
f8762f2e
authored
Aug 13, 2016
by
Thom Wiggers
📐
Browse files
Use get_full_name for str(Member)
Closes
#37
parent
462720f9
Changes
1
Hide whitespace changes
Inline
Side-by-side
website/members/models.py
View file @
f8762f2e
...
...
@@ -91,8 +91,8 @@ class Member(models.Model):
@
classmethod
def
all_with_membership
(
cls
,
membership_type
,
prefetch
=
None
):
return
[
x
for
x
in
cls
.
objects
.
all
().
prefetch_related
(
prefetch
)
if
x
.
current_membership
and
x
.
current_membership
.
type
==
membership_type
]
if
x
.
current_membership
and
x
.
current_membership
.
type
==
membership_type
]
# ---- Address information -----
...
...
@@ -271,7 +271,7 @@ class Member(models.Model):
return
self
.
user
.
get_full_name
()
def
__str__
(
self
):
return
self
.
display_name
(
)
return
'{} ({})'
.
format
(
self
.
get_full_name
(),
self
.
username
)
class
Membership
(
models
.
Model
):
...
...
Thom Wiggers
📐
@twiggers
mentioned in commit
7f1671fd
·
Aug 13, 2016
mentioned in commit
7f1671fd
mentioned in commit 7f1671fd45e72772b46e734322f5ed97c29af94a
Toggle commit list
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