diff --git a/app/controllers/admin/communication/extranets_controller.rb b/app/controllers/admin/communication/extranets_controller.rb
index 09c8617de5efe5e207c3d2704ea9bea7c739270c..df30f310aab2c5771f3e32f159feefee8675c88f 100644
--- a/app/controllers/admin/communication/extranets_controller.rb
+++ b/app/controllers/admin/communication/extranets_controller.rb
@@ -64,10 +64,31 @@ class Admin::Communication::ExtranetsController < Admin::Communication::Applicat
def extranet_params
params.require(:communication_extranet)
- .permit(:name, :host, :about_type, :about_id,
- :registration_contact, :logo, :logo_delete, :favicon, :favicon_delete,
- :terms, :privacy_policy, :cookies_policy, :color,
- :has_sso, :sso_target_url, :sso_cert, :sso_name_identifier_format, :sso_mapping, :sso_button_label
+ .permit(
+ :about_id,
+ :about_type,
+ :color,
+ :cookies_policy,
+ :favicon,
+ :favicon_delete,
+ :feature_alumni,
+ :feature_dam,
+ :feature_directory,
+ :feature_jobs,
+ :feature_posts,
+ :has_sso,
+ :host,
+ :logo,
+ :logo_delete,
+ :name,
+ :privacy_policy,
+ :registration_contact,
+ :sso_target_url,
+ :sso_cert,
+ :sso_name_identifier_format,
+ :sso_mapping,
+ :sso_button_label,
+ :terms,
)
end
end
diff --git a/app/models/communication/extranet.rb b/app/models/communication/extranet.rb
index da5242530e14600fef86bc74bc50f113569307b2..22db4bdadb5d1bb2afc3da3ff2f8d1d3a13bf17e 100644
--- a/app/models/communication/extranet.rb
+++ b/app/models/communication/extranet.rb
@@ -6,6 +6,11 @@
# about_type :string indexed => [about_id]
# color :string
# cookies_policy :text
+# feature_alumni :boolean default(FALSE)
+# feature_dam :boolean default(FALSE)
+# feature_directory :boolean default(FALSE)
+# feature_jobs :boolean default(FALSE)
+# feature_posts :boolean default(FALSE)
# has_sso :boolean default(FALSE)
# host :string
# name :string
diff --git a/app/views/admin/communication/extranets/_form.html.erb b/app/views/admin/communication/extranets/_form.html.erb
index 27532500a476af46882a73a5bff7e9412ecfb448..dcca27bde99c7c1246cc495c49f1beff41a8318b 100644
--- a/app/views/admin/communication/extranets/_form.html.erb
+++ b/app/views/admin/communication/extranets/_form.html.erb
@@ -25,6 +25,13 @@
<% end %>
</div>
<div class="col-xl-6">
+ <%= osuny_panel t('extranet.features') do %>
+ <%= f.input :feature_alumni %>
+ <%= f.input :feature_directory %>
+ <%= f.input :feature_dam %>
+ <%= f.input :feature_posts %>
+ <%= f.input :feature_jobs %>
+ <% end %>
<%= osuny_panel t('legal') do %>
<%= f.input :terms, as: :summernote %>
<%= f.input :privacy_policy, as: :summernote %>
@@ -33,23 +40,24 @@
</div>
</div>
- <h2 class="category"><%= t('university.sso') %></h2>
- <div class="row">
- <div class="col-xl-6">
- <%= f.input :has_sso %>
- <div class="sso-inputs">
- <%= f.input :sso_target_url, required: true %>
- <%= f.input :sso_cert, required: true %>
- <%= f.input :sso_name_identifier_format, required: true %>
- <%= f.input :sso_button_label %>
+ <%= osuny_panel t('university.sso') do %>
+ <div class="row">
+ <div class="col-xl-6">
+ <%= f.input :has_sso %>
+ <div class="sso-inputs">
+ <%= f.input :sso_target_url, required: true %>
+ <%= f.input :sso_cert, required: true %>
+ <%= f.input :sso_name_identifier_format, required: true %>
+ <%= f.input :sso_button_label %>
+ </div>
+ </div>
+ <div class="col-xl-6 sso-inputs">
+ <h4 class="mb-4"><%= University.human_attribute_name('sso_mapping') %></h4>
+ <%= f.error_notification message: f.object.errors[:sso_mapping].to_sentence if f.object.errors[:sso_mapping].present? %>
+ <%= render 'server/universities/sso_mapping', object: extranet %>
</div>
</div>
- <div class="col-xl-6 sso-inputs">
- <h4 class="mb-4"><%= University.human_attribute_name('sso_mapping') %></h4>
- <%= f.error_notification message: f.object.errors[:sso_mapping].to_sentence if f.object.errors[:sso_mapping].present? %>
- <%= render 'server/universities/sso_mapping', object: extranet %>
- </div>
- </div>
+ <% end %>
<% content_for :action_bar_right do %>
<%= submit f %>
diff --git a/config/locales/communication/en.yml b/config/locales/communication/en.yml
index db55b72350b224452bfbc183c5e738891507d6bf..7f0ecac151380a08444ecfd58aefaffda547367b 100644
--- a/config/locales/communication/en.yml
+++ b/config/locales/communication/en.yml
@@ -52,6 +52,11 @@ en:
cookies_policy: Cookies policy
description: Espaces d'échanges sécurisés dédiés aux personnes authentifiées
favicon: Favicon (.png)
+ feature_alumni: Alumni
+ feature_dam: Asset management
+ feature_directory: Directory
+ feature_posts: News
+ feature_jobs: Job board
has_sso: Has SSO?
host: Domain
logo: Logo (.png, .jpg, .svg)
diff --git a/config/locales/communication/fr.yml b/config/locales/communication/fr.yml
index 827b5f231f299cb081e470dc4055329de9e73113..57ade73259e8c075b1b773536908543e3b7b863f 100644
--- a/config/locales/communication/fr.yml
+++ b/config/locales/communication/fr.yml
@@ -52,6 +52,11 @@ fr:
cookies_policy: Politique de cookies
description: Espaces d'échanges sécurisés dédiés aux personnes authentifiées
favicon: Favicon (.png)
+ feature_alumni: Alumni
+ feature_dam: Gestion de fichiers
+ feature_directory: Répertoire
+ feature_posts: Actualités
+ feature_jobs: Offres d'emploi
has_sso: A un SSO ?
host: Domaine
logo: Logo (.png, .jpg, .svg)
diff --git a/config/locales/extranet/en.yml b/config/locales/extranet/en.yml
index f3766ca4dad4a61a8234be50bb186c114372bb09..b8f4c467cecdc33b73a5e8a60368d8dc35761be2 100644
--- a/config/locales/extranet/en.yml
+++ b/config/locales/extranet/en.yml
@@ -1,5 +1,6 @@
en:
extranet:
+ features: Features
account:
my: My account
edit: Edit account
diff --git a/config/locales/extranet/fr.yml b/config/locales/extranet/fr.yml
index 453c69e96d8938a4a37d8906cb280d07b356d3f9..5efd360d0977a207e69a2750dfedcaeda0cad419 100644
--- a/config/locales/extranet/fr.yml
+++ b/config/locales/extranet/fr.yml
@@ -1,5 +1,6 @@
fr:
extranet:
+ features: Fonctionnalités
account:
my: Mon compte
edit: Modifier mon compte
diff --git a/db/migrate/20230227040442_add_features_to_communication_extranets.rb b/db/migrate/20230227040442_add_features_to_communication_extranets.rb
new file mode 100644
index 0000000000000000000000000000000000000000..edffe20d22ce990e48a001f4ad17c0514c68592e
--- /dev/null
+++ b/db/migrate/20230227040442_add_features_to_communication_extranets.rb
@@ -0,0 +1,9 @@
+class AddFeaturesToCommunicationExtranets < ActiveRecord::Migration[7.0]
+ def change
+ add_column :communication_extranets, :feature_alumni, :boolean, default: false
+ add_column :communication_extranets, :feature_directory, :boolean, default: false
+ add_column :communication_extranets, :feature_dam, :boolean, default: false
+ add_column :communication_extranets, :feature_posts, :boolean, default: false
+ add_column :communication_extranets, :feature_jobs, :boolean, default: false
+ end
+end
diff --git a/test/fixtures/communication/extranets.yml b/test/fixtures/communication/extranets.yml
index c11ef9e9fbf6dbb1fcb38a1d4f7106c7ca2c0d8b..1cd80fdf303128c4d4c86528bfdc5fe2658dd16b 100644
--- a/test/fixtures/communication/extranets.yml
+++ b/test/fixtures/communication/extranets.yml
@@ -6,6 +6,11 @@
# about_type :string indexed => [about_id]
# color :string
# cookies_policy :text
+# feature_alumni :boolean default(FALSE)
+# feature_dam :boolean default(FALSE)
+# feature_directory :boolean default(FALSE)
+# feature_jobs :boolean default(FALSE)
+# feature_posts :boolean default(FALSE)
# has_sso :boolean default(FALSE)
# host :string
# name :string
@@ -37,4 +42,4 @@ default_extranet:
name: Extranet de test
host: extranet.osuny.test
about: default_program (Education::Program)
- university: default_university
\ No newline at end of file
+ university: default_university
diff --git a/test/fixtures/research/hal/publications.yml b/test/fixtures/research/hal/publications.yml
index 2ccd47c2eaf77efc512b4bf3bfad8edabcd83838..8580abd33e5ddfa09d5929af7d96930803a92e87 100644
--- a/test/fixtures/research/hal/publications.yml
+++ b/test/fixtures/research/hal/publications.yml
@@ -1,6 +1,6 @@
# == Schema Information
#
-# Table name: research_publications
+# Table name: research_hal_publications
#
# id :uuid not null, primary key
# data :jsonb
@@ -17,7 +17,7 @@
#
# Indexes
#
-# index_research_publications_on_docid (docid)
+# index_research_hal_publications_on_docid (docid)
#
default_publication:
diff --git a/test/models/communication/extranet_test.rb b/test/models/communication/extranet_test.rb
index 0b396fd48f3595a831e321d3b9c27fe2c11104b8..f13b70326db7c38db821ebae78bedabc3de56bec 100644
--- a/test/models/communication/extranet_test.rb
+++ b/test/models/communication/extranet_test.rb
@@ -6,6 +6,11 @@
# about_type :string indexed => [about_id]
# color :string
# cookies_policy :text
+# feature_alumni :boolean default(FALSE)
+# feature_dam :boolean default(FALSE)
+# feature_directory :boolean default(FALSE)
+# feature_jobs :boolean default(FALSE)
+# feature_posts :boolean default(FALSE)
# has_sso :boolean default(FALSE)
# host :string
# name :string