Merge branch 'main' of github.com:noesya/osuny

app/controllers/extranet/application_controller.rb

@@ -31,11 +31,11 @@ class Extranet::ApplicationController < ApplicationController
   end
 
   def user_is_alumnus
-    about.alumni.find_by(id: current_user.person&.id).present?
+    current_extranet.feature_alumni? && about.alumni.find_by(id: current_user.person&.id).present?
   end
 
   def user_is_contact
-    current_extranet.connected_people.find_by(id: current_user.person&.id).present?
+    current_extranet.feature_contacts? && current_extranet.connected_people.find_by(id: current_user.person&.id).present?
   end
 
 end

app/models/communication/extranet.rb

@@ -95,7 +95,13 @@ class Communication::Extranet < ApplicationRecord
   end
 
   def users
-    university.users.where(person: alumni)
+    if feature_alumni?
+      university.users.where(person: alumni)
+    elsif feature_contacts?
+      university.users.where(person: connected_people)
+    else
+      university.users.none
+    end
   end
 
   def cohorts