retrieve correct displaynames for users (from consumer if it is openHPI, otherwise use internal name)
This commit is contained in:
@ -3,4 +3,13 @@ class ExternalUser < ActiveRecord::Base
|
||||
|
||||
validates :consumer_id, presence: true
|
||||
validates :external_id, presence: true
|
||||
|
||||
def displayname
|
||||
result = name
|
||||
if(consumer.name == 'openHPI')
|
||||
result = Xikolo::UserClient.get(external_id.to_s)[:display_name]
|
||||
end
|
||||
result
|
||||
end
|
||||
|
||||
end
|
||||
|
@ -21,4 +21,9 @@ class InternalUser < ActiveRecord::Base
|
||||
def teacher?
|
||||
role == 'teacher'
|
||||
end
|
||||
|
||||
def displayname
|
||||
name
|
||||
end
|
||||
|
||||
end
|
||||
|
@ -13,7 +13,7 @@ h1 = RequestForComment.model_name.human(count: 2)
|
||||
tr data-id=request_for_comment.id
|
||||
td = link_to(request_for_comment.exercise.title, request_for_comment)
|
||||
td = request_for_comment.exercise.execution_environment
|
||||
td = request_for_comment.user.name
|
||||
td = request_for_comment.user.displayname
|
||||
td = request_for_comment.requested_at
|
||||
|
||||
= render('shared/pagination', collection: @request_for_comments)
|
Reference in New Issue
Block a user