🐛 better fix for #525

moustachu · moustachu · commit 25bd9a4a9ce3 · 2019-03-12T12:52:33.000+01:00
- revert 7b6f2e5 for `author_event`
- add conditional checks for `UserPresenter` on Organization class
diff --git a/decidim-core/app/presenters/decidim/user_presenter.rb b/decidim-core/app/presenters/decidim/user_presenter.rb
@@ -13,7 +13,7 @@ class UserPresenter < SimpleDelegator
     # nickname presented in a twitter-like style
     #
     def nickname
-      "@#{__getobj__.nickname}"
+      __getobj__.is_a?(Decidim::Organization) ? "" : "@#{__getobj__.nickname}"
     end
 
     def badge
@@ -25,13 +25,13 @@ def badge
     delegate :url, to: :avatar, prefix: true
 
     def profile_url
-      return "" if deleted?
+      return "" if __getobj__.is_a?(Decidim::Organization) || deleted?
 
       decidim.profile_url(__getobj__.nickname, host: __getobj__.organization.host)
     end
 
     def profile_path
-      return "" if deleted?
+      return "" if __getobj__.is_a?(Decidim::Organization) || deleted?
 
       decidim.profile_path(__getobj__.nickname)
     end
diff --git a/decidim-core/lib/decidim/events/author_event.rb b/decidim-core/lib/decidim/events/author_event.rb
@@ -28,18 +28,9 @@ def author_url
           author_presenter&.profile_url.to_s
         end
 
-        def official?
-          resource.respond_to?(:official?) && resource.official?
-        end
-
         def author_presenter
-          if official?
-            @author_presenter ||= "#{resource.class.parent}::OfficialAuthorPresenter".constantize.new
-          elsif resource.respond_to?(:user_group) && resource.user_group
-            @author_presenter ||= Decidim::UserGroupPresenter.new(resource.user_group)
-          elsif resource.respond_to?(:author) && resource.author
-            @author_presenter ||= Decidim::UserPresenter.new(resource.author)
-          end
+          return unless author
+          @author_presenter ||= Decidim::UserPresenter.new(author)
         end
 
         def author
