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
f7238fbc
Unverified
Commit
f7238fbc
authored
Dec 06, 2016
by
Joost Rijneveld
Browse files
Do not display nickname or initials as none
parent
85a6f424
Changes
1
Hide whitespace changes
Inline
Side-by-side
website/members/models.py
View file @
f7238fbc
...
...
@@ -313,13 +313,15 @@ class Member(models.Model):
def
display_name
(
self
):
pref
=
self
.
display_name_preference
if
pref
==
'nickname'
:
if
pref
==
'nickname'
and
self
.
nickname
is
not
None
:
return
self
.
nickname
if
pref
==
'firstname'
:
return
self
.
user
.
first_name
elif
pref
==
'initials'
:
return
'{} {}'
.
format
(
self
.
initials
,
self
.
user
.
last_name
)
elif
pref
==
'fullnick'
:
if
self
.
initials
:
return
'{} {}'
.
format
(
self
.
initials
,
self
.
user
.
last_name
)
return
self
.
user
.
last_name
elif
pref
==
'fullnick'
and
self
.
nickname
is
not
None
:
return
"{} '{}' {}"
.
format
(
self
.
user
.
first_name
,
self
.
nickname
,
self
.
user
.
last_name
)
...
...
@@ -332,10 +334,13 @@ class Member(models.Model):
def
short_display_name
(
self
):
pref
=
self
.
display_name_preference
if
pref
==
'nickname'
or
pref
==
'nicklast'
:
if
(
self
.
nickname
is
not
None
and
(
pref
==
'nickname'
or
pref
==
'nicklast'
)):
return
self
.
nickname
elif
pref
==
'initials'
:
return
'{} {}'
.
format
(
self
.
initials
,
self
.
user
.
last_name
)
if
self
.
initials
:
return
'{} {}'
.
format
(
self
.
initials
,
self
.
user
.
last_name
)
return
self
.
user
.
last_name
else
:
return
self
.
user
.
first_name
return
...
...
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