From 59bbb3edebdf88fced9105c2f27b2cc141bf410c Mon Sep 17 00:00:00 2001 From: Ralf Teusner Date: Mon, 3 Apr 2017 11:45:39 +0200 Subject: [PATCH 1/3] set the default to_s of user to displayname --- app/models/concerns/user.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/models/concerns/user.rb b/app/models/concerns/user.rb index 28601cdf..89855062 100644 --- a/app/models/concerns/user.rb +++ b/app/models/concerns/user.rb @@ -26,6 +26,6 @@ module User end def to_s - name + displayname end end From 75481d902b9c2c9ac855fc45c6a50d2143110cb5 Mon Sep 17 00:00:00 2001 From: Ralf Teusner Date: Mon, 3 Apr 2017 13:13:58 +0200 Subject: [PATCH 2/3] added a nil check for consumer. --- app/models/external_user.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/models/external_user.rb b/app/models/external_user.rb index 538f4997..f1314a59 100644 --- a/app/models/external_user.rb +++ b/app/models/external_user.rb @@ -6,7 +6,7 @@ class ExternalUser < ActiveRecord::Base def displayname result = name - if(consumer.name == 'openHPI') + if(!consumer.nil? && consumer.name == 'openHPI') result = Rails.cache.fetch("#{cache_key}/displayname", expires_in: 12.hours) do Xikolo::UserClient.get(external_id.to_s)[:display_name] end From 156d9211459d37d4a56e1f95be07dd0840ac8161 Mon Sep 17 00:00:00 2001 From: Ralf Teusner Date: Mon, 3 Apr 2017 13:22:12 +0200 Subject: [PATCH 3/3] removed the possibility that the name of external users might be in the displayname alltogether --- app/models/external_user.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/models/external_user.rb b/app/models/external_user.rb index f1314a59..8a7cbb58 100644 --- a/app/models/external_user.rb +++ b/app/models/external_user.rb @@ -5,7 +5,7 @@ class ExternalUser < ActiveRecord::Base validates :external_id, presence: true def displayname - result = name + result = "User " + user_id if(!consumer.nil? && consumer.name == 'openHPI') result = Rails.cache.fetch("#{cache_key}/displayname", expires_in: 12.hours) do Xikolo::UserClient.get(external_id.to_s)[:display_name]