Merge branch 'rework/website-about' of github.com:noesya/osuny into rework/website-about

app/models/university/person/administrator.rb

@@ -45,16 +45,6 @@ class University::Person::Administrator < University::Person
   end
 
   def for_website?(website)
-    is_administration && website.has_administrators? && (
-      website.about
-             .university_people_through_role_involvements
-             .find_by(id: id)
-             .present? ||
-      website.education_programs
-             .published
-             .joins(:involvements_through_roles)
-             .where(university_person_involvements: { person_id: id })
-             .any?
-    )
+    is_administration && website.has_administrators? && website.administrators.pluck(:id).include?(self.id)
   end
 end

app/models/university/person/author.rb

@@ -45,8 +45,6 @@ class University::Person::Author < University::Person
   end
 
   def for_website?(website)
-    communication_website_posts.published
-                              .where(communication_website_id: website&.id)
-                              .any?
+    website.has_authors? && website.authors.pluck(:id).include?(self.id)
   end
 end