htwkmooc/codeocean
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #107 from openHPI/display_name_in_header

Browse Source 
Display name in header
This commit is contained in:
rteusner
2017-04-03 13:23:09 +02:00
committed by GitHub
parent 865bd59127 156d921145
commit 7222a10f8d
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/models/concerns/user.rb
View File

@ -26,6 +26,6 @@ module User
end end
def to_s def to_s
name displayname
end end
end end

4
app/models/external_user.rb
View File

@ -5,8 +5,8 @@ class ExternalUser < ActiveRecord::Base
validates :external_id, presence: true validates :external_id, presence: true
def displayname def displayname
result = name result = "User " + user_id
if(consumer.name == 'openHPI') if(!consumer.nil? && consumer.name == 'openHPI')
result = Rails.cache.fetch("#{cache_key}/displayname", expires_in: 12.hours) do result = Rails.cache.fetch("#{cache_key}/displayname", expires_in: 12.hours) do
Xikolo::UserClient.get(external_id.to_s)[:display_name] Xikolo::UserClient.get(external_id.to_s)[:display_name]
end end