Merge pull request #895 from noesya/extranet_registration

Ajustement des droits d'enregistrement pour les extranets

app/models/communication/extranet/with_features.rb

@@ -11,7 +11,7 @@ module Communication::Extranet::WithFeatures
     ]
   end
 
-  def feature?(identifier)
+  def has_feature?(identifier)
     public_send "feature_#{identifier}"
   end
-end
\ No newline at end of file
+end

app/models/user/with_registration_context.rb

@@ -9,7 +9,7 @@ module User::WithRegistrationContext
     private
 
     def extranet_access
-      unless registration_context.alumni.where(email: email).any?
+      unless user_can_access_registration_context?
         if registration_context.registration_contact.present?
           errors.add :email, I18n.t('extranet.errors.email_not_allowed_with_contact', contact: registration_context.registration_contact)
         else
@@ -18,5 +18,17 @@ module User::WithRegistrationContext
       end
     end
 
+    def user_can_access_registration_context?
+      user_is_alumni? || user_is_contact?
+    end
+
+    def user_is_alumni?
+      registration_context.has_feature?(:alumni) && registration_context.alumni.where(email: email).any?
+    end
+
+    def user_is_contact?
+      registration_context.has_feature?(:contacts) && registration_context.connected_persons.where(email: email).any?
+    end
+
   end
 end

app/views/admin/communication/extranets/_sidebar.html.erb

@@ -10,7 +10,7 @@
         },
       ]
       Communication::Extranet::FEATURES.each do |feature|
-        next unless @extranet.feature? feature
+        next unless @extranet.has_feature? feature
         property = "feature_#{feature}"
         constant = "COMMUNICATION_EXTRANET_#{feature.upcase}"
         navigation << {

app/views/admin/communication/extranets/show.html.erb

@@ -13,9 +13,9 @@
 <%= render 'admin/communication/extranets/sidebar' do %>
   <div class="row">
     <% Communication::Extranet::FEATURES.each do |feature| %>
-      <% 
+      <%
       property = "feature_#{feature}"
-      active = @extranet.feature? feature
+      active = @extranet.has_feature? feature
       next unless active
       %>
       <div class="col-lg-3">