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

2017-09-06 09:35:25 +02:00
parent 2869c0d7b8 0f65508951
commit b0bff8c573
2 changed files with 6 additions and 8 deletions
--- a/app/models/external_user.rb
+++ b/app/models/external_user.rb
@@ -5,11 +5,9 @@ class ExternalUser < ActiveRecord::Base
  validates :external_id, presence: true

  def displayname
-    result =  "User " + id.to_s
-    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
+    result = name
+    if(result == nil || result == "")
+      result = "User " + id.to_s
    end
    result
  end