External User: Set name to displayname and introduce real_name
This commit is contained in:
@ -4,12 +4,28 @@ class ExternalUser < ApplicationRecord
|
|||||||
validates :consumer_id, presence: true
|
validates :consumer_id, presence: true
|
||||||
validates :external_id, presence: true
|
validates :external_id, presence: true
|
||||||
|
|
||||||
def displayname
|
def name
|
||||||
result = name
|
# Internal name, shown to teachers and administrators
|
||||||
if(result == nil || result == "")
|
pseudo_name
|
||||||
result = "User " + id.to_s
|
|
||||||
end
|
|
||||||
result
|
|
||||||
end
|
end
|
||||||
|
|
||||||
|
def displayname
|
||||||
|
# External name, shown to the user itself and other users, e.g. on RfCs
|
||||||
|
pseudo_name
|
||||||
|
end
|
||||||
|
|
||||||
|
def real_name
|
||||||
|
# Name attribute of the object as persistet in the database
|
||||||
|
self[:name]
|
||||||
|
end
|
||||||
|
|
||||||
|
def pseudo_name
|
||||||
|
if real_name.blank?
|
||||||
|
"User " + id.to_s
|
||||||
|
else
|
||||||
|
real_name
|
||||||
|
end
|
||||||
|
end
|
||||||
|
private :pseudo_name
|
||||||
|
|
||||||
end
|
end
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
h1 = @user.name
|
h1 = @user.name
|
||||||
|
|
||||||
= row(label: 'external_user.name', value: @user.name)
|
= row(label: 'external_user.name', value: @user.real_name)
|
||||||
//= row(label: 'external_user.email', value: @user.email)
|
//= row(label: 'external_user.email', value: @user.email)
|
||||||
= row(label: 'external_user.consumer', value: link_to(@user.consumer, @user.consumer))
|
= row(label: 'external_user.consumer', value: link_to(@user.consumer, @user.consumer))
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user