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

Merge remote-tracking branch 'origin/master' into rework-comment-modal

Browse Source
This commit is contained in:
Maximilian Grundke
2017-09-06 09:35:25 +02:00
parent 2869c0d7b8 0f65508951
commit b0bff8c573
2 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/controllers/concerns/lti.rb
View File

@ -42,12 +42,12 @@ module Lti
private :external_user_email private :external_user_email
def external_user_name(provider) def external_user_name(provider)
# save person_name_full if supplied. this is the display_name, if it is set.
# else only save the firstname, we don't want lastnames (family names)
if provider.lis_person_name_full if provider.lis_person_name_full
provider.lis_person_name_full provider.lis_person_name_full
elsif provider.lis_person_name_given && provider.lis_person_name_family
"#{provider.lis_person_name_given} #{provider.lis_person_name_family}"
else else
provider.lis_person_name_given || provider.lis_person_name_family provider.lis_person_name_given
end end
end end
private :external_user_name private :external_user_name

8
app/models/external_user.rb
View File

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