Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

4311 - Missing display name fix #4363

Open
wants to merge 2 commits into
base: development
Choose a base branch
from
Open

4311 - Missing display name fix #4363

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c6c6d59
4311 - Missing display name fix
WillNigel23 Sep 30, 2024
7860749
Fix devise redirect
WillNigel23 Oct 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions app/models/user.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,8 +150,9 @@ def email_does_not_match_denylist
end
end


def update_display_name
self.real_name = nil if self.real_name.blank?

if self.owner
self.display_name = self.real_name
else
Expand Down Expand Up @@ -287,9 +288,9 @@ def like_owner?(obj)

def display_name
if self.guest
"Guest"
'Guest'
else
self[:display_name] || self[:login]
self[:display_name].presence || self[:login]
end
end

Expand Down
Loading