|
|
|
@@ -705,12 +705,13 @@ class User < Owner |
|
|
|
end |
|
|
|
|
|
|
|
def show_real_name |
|
|
|
name = lastname + firstname |
|
|
|
if name.blank? |
|
|
|
nickname.blank? ? login : nickname |
|
|
|
else |
|
|
|
name |
|
|
|
end |
|
|
|
# name = lastname + firstname |
|
|
|
# if name.blank? |
|
|
|
# nickname.blank? ? login : nickname |
|
|
|
# else |
|
|
|
# name |
|
|
|
# end |
|
|
|
nickname.blank? ? login : nickname |
|
|
|
end |
|
|
|
|
|
|
|
def update_hashed_password |
|
|
|
|