diff --git a/app/assets/javascripts/admin/commons/conditional.js b/app/assets/javascripts/admin/commons/conditional.js
new file mode 100644
index 0000000000000000000000000000000000000000..b8df06fec06a346d7c2e3dc1f0850e04ee07e6d1
--- /dev/null
+++ b/app/assets/javascripts/admin/commons/conditional.js
@@ -0,0 +1,56 @@
+/* global */
+window.osuny.conditional = {
+ init: function () {
+ 'use strict';
+ var element,
+ i;
+ this.elements = document.querySelectorAll('[data-conditional="true"]');
+ for (i = 0; i < this.elements.length; i += 1) {
+ element = this.elements[i];
+ element.addEventListener('change', this.change.bind(this));
+ this.update(element.id, element.value);
+ }
+ },
+
+ change: function (event) {
+ 'use strict';
+ this.update(event.target.id, event.target.value);
+ },
+
+ update: function (source, value) {
+ 'use strict';
+ var allTargets = document.querySelectorAll('[data-conditional-source="' + source + '"]'),
+ activeTargets = document.querySelectorAll('[data-conditional-source="' + source + '"][data-conditional-value="' + value + '"]'),
+ i,
+ target;
+ for (i = 0; i < allTargets.length; i += 1) {
+ target = allTargets[i];
+ this.hide(target);
+ }
+ for (i = 0; i < activeTargets.length; i += 1) {
+ target = activeTargets[i];
+ this.show(target);
+ }
+ },
+
+ hide: function (target) {
+ 'use strict';
+ target.classList.add('d-none');
+ target.removeAttribute('required');
+ target.setAttribute('disabled', 'disabled');
+ },
+
+ show: function (target) {
+ 'use strict';
+ target.classList.remove('d-none');
+ target.removeAttribute('disabled');
+ target.setAttribute('required', 'required');
+ },
+
+ invoke: function () {
+ 'use strict';
+ return {
+ init: this.init.bind(this)
+ };
+ }
+}.invoke().init();
diff --git a/app/assets/javascripts/admin/communication/init.js b/app/assets/javascripts/admin/communication/init.js
index f584e2b9ca3af3d8b2c1467928f860587797b54c..19ec2dabb9dcf27049b92fe63ba758ef05065377 100644
--- a/app/assets/javascripts/admin/communication/init.js
+++ b/app/assets/javascripts/admin/communication/init.js
@@ -1,5 +1,4 @@
//= require_self
//= require ./menu_items
-//= require ./websites
window.osuny.communication = {};
diff --git a/app/assets/javascripts/admin/communication/websites.js b/app/assets/javascripts/admin/communication/websites.js
deleted file mode 100644
index acafaa51a936ad8dffd9335882c851cf06972af4..0000000000000000000000000000000000000000
--- a/app/assets/javascripts/admin/communication/websites.js
+++ /dev/null
@@ -1,72 +0,0 @@
-window.osuny.communication.websites = {
- init: function () {
- 'use strict';
- this.aboutTypeInput = document.querySelector('form #communication_website_about_type');
- if (this.aboutTypeInput === null) {
- return;
- }
-
- this.elementsForTypeSchool = document.querySelectorAll('.type-school');
- this.requiredInputsForTypeSchool = document.querySelectorAll('.type-school .required select, .type-school .required input');
-
- this.elementsForTypeJournal = document.querySelectorAll('.type-journal');
- this.requiredInputsForTypeJournal = document.querySelectorAll('.type-journal .required select, .type-journal .required input');
-
- this.aboutTypeInput.addEventListener('change', this.onTypeChange.bind(this));
- this.onTypeChange();
- },
-
- onTypeChange: function () {
- 'use strict';
- var aboutType = this.aboutTypeInput.value;
-
- if (aboutType === 'Education::School') {
- this.showElements(this.elementsForTypeSchool, this.requiredInputsForTypeSchool);
- this.hideElements(this.elementsForTypeJournal, this.requiredInputsForTypeJournal);
- } else if (aboutType === 'Research::Journal') {
- this.showElements(this.elementsForTypeJournal, this.requiredInputsForTypeJournal);
- this.hideElements(this.elementsForTypeSchool, this.requiredInputsForTypeSchool);
- } else {
- this.hideElements(this.elementsForTypeJournal, this.requiredInputsForTypeJournal);
- this.hideElements(this.elementsForTypeSchool, this.requiredInputsForTypeSchool);
- }
- },
-
- showElements: function (elements, requiredInputs) {
- 'use strict';
- var i;
- for (i = 0; i < elements.length; i += 1) {
- elements[i].classList.remove('d-none');
- }
- for (i = 0; i < requiredInputs.length; i += 1) {
- requiredInputs[i].removeAttribute('disabled');
- requiredInputs[i].setAttribute('required', 'required');
- }
- },
-
- hideElements: function (elements, requiredInputs) {
- 'use strict';
- var i;
- for (i = 0; i < elements.length; i += 1) {
- elements[i].classList.add('d-none');
- }
- for (i = 0; i < requiredInputs.length; i += 1) {
- requiredInputs[i].removeAttribute('required');
- requiredInputs[i].setAttribute('disabled', 'disabled');
- }
- },
-
- invoke: function () {
- 'use strict';
- return {
- init: this.init.bind(this)
- };
- }
-}.invoke();
-
-window.addEventListener('DOMContentLoaded', function () {
- 'use strict';
- if (document.body.classList.contains('websites-new') || document.body.classList.contains('websites-edit')) {
- window.osuny.communication.websites.init();
- }
-});
diff --git a/app/models/communication/website/with_abouts.rb b/app/models/communication/website/with_abouts.rb
index 0f2a83d0601ca62954eae31f1f475ca58f4e1fb0..3fd3e6333904e6ad600c6cc94a413e259a2bc60c 100644
--- a/app/models/communication/website/with_abouts.rb
+++ b/app/models/communication/website/with_abouts.rb
@@ -27,7 +27,7 @@ module Communication::Website::WithAbouts
dependent: :destroy
def self.about_types
- [nil, Education::School.name, Research::Journal.name]
+ [nil, Education::School.name, Research::Laboratory.name, Research::Journal.name]
end
after_save_commit :set_programs_categories!, if: -> (website) { website.about_school? }
@@ -41,6 +41,10 @@ module Communication::Website::WithAbouts
about_type == 'Research::Journal'
end
+ def about_laboratory?
+ about_type == 'Research::Laboratory'
+ end
+
def programs
about_school? ? about.programs : Education::Program.none
end
@@ -77,6 +81,7 @@ module Communication::Website::WithAbouts
university_id: university.id
)
set_programs_categories_at_level! programs_root_category, about.programs.root.ordered
+ rescue
end
protected
diff --git a/app/views/admin/communication/websites/_form.html.erb b/app/views/admin/communication/websites/_form.html.erb
index 124af3265697b9a2894aefe7a31395464874c392..6a4636411d7769caee2a9c4124e0c38105188ee2 100644
--- a/app/views/admin/communication/websites/_form.html.erb
+++ b/app/views/admin/communication/websites/_form.html.erb
@@ -9,21 +9,34 @@
<%= f.input :name %>
<%= f.input :about_type,
collection: Communication::Website.about_types,
+ input_html: { data: { conditional: true } },
label_method: lambda { |object|
I18n.t("activerecord.attributes.communication/website.about_#{object}")
},
include_blank: false %>
- <div class="type-school">
+ <div class="d-none"
+ data-conditional-source="communication_website_about_type"
+ data-conditional-value="Education::School">
<%= f.input :about_id,
collection: current_university.education_schools,
label: Education::School.model_name.human,
- required: true %>
+ include_blank: false %>
</div>
- <div class="type-journal">
+ <div class="d-none"
+ data-conditional-source="communication_website_about_type"
+ data-conditional-value="Research::Journal">
<%= f.input :about_id,
collection: current_university.research_journals,
label: Research::Journal.model_name.human,
- required: true %>
+ include_blank: false %>
+ </div>
+ <div class="d-none"
+ data-conditional-source="communication_website_about_type"
+ data-conditional-value="Research::Laboratory">
+ <%= f.input :about_id,
+ collection: current_university.research_laboratories,
+ label: Research::Laboratory.model_name.human,
+ include_blank: false %>
</div>
</div>
</div>
diff --git a/config/locales/communication/en.yml b/config/locales/communication/en.yml
index 81386b5242d88cec7b2f847b44becb337806f4a3..b261425583dc06e396145230c5e6776d51baa9e4 100644
--- a/config/locales/communication/en.yml
+++ b/config/locales/communication/en.yml
@@ -37,6 +37,7 @@ en:
about_: Independent website (no specific subject)
about_Education::School: School website
about_Research::Journal: Journal website
+ about_Research::Laboratory: Laboratory website
about_type: About
name: Name
static_pathname_administrators: Administration staff's static pathname
diff --git a/config/locales/communication/fr.yml b/config/locales/communication/fr.yml
index 01d64ed59b1dd00a0fbeb9c6777b0144fa597c2a..14427911760f2ddee450702dca874cff4a9bf473 100644
--- a/config/locales/communication/fr.yml
+++ b/config/locales/communication/fr.yml
@@ -37,6 +37,7 @@ fr:
about_: Site indépendant (aucun sujet)
about_Education::School: Site d'école
about_Research::Journal: Site de revue scientifique
+ about_Research::Laboratory: Site de laboratoire
about_type: Sujet du site
name: Nom
static_pathname_administrators: Chemin statique de l'équipe administrative