diff --git a/app/models/communication/website/permalink.rb b/app/models/communication/website/permalink.rb index e3dd63852e59c01510eb9ad0500f9b8cb7f93ac3..92de93a1bcc8ba89dc449da3c53fee16cdbcd2ab 100644 --- a/app/models/communication/website/permalink.rb +++ b/app/models/communication/website/permalink.rb @@ -79,7 +79,7 @@ class Communication::Website::Permalink < ApplicationRecord def self.required_kinds_in_website(website) MAPPING.values.select { |permalink_class| - permalink_class.required_for_website?(website) + permalink_class.required_in_config?(website) } end diff --git a/app/models/communication/website/permalink/administrator.rb b/app/models/communication/website/permalink/administrator.rb index cfdbf699097a0ecc0f32f8e9c61aab593501d481..8eafca77bd339032e43390c1ccf91db010df2116 100644 --- a/app/models/communication/website/permalink/administrator.rb +++ b/app/models/communication/website/permalink/administrator.rb @@ -1,5 +1,5 @@ class Communication::Website::Permalink::Administrator < Communication::Website::Permalink - def self.required_for_website?(website) + def self.required_in_config?(website) website.has_administrators? end diff --git a/app/models/communication/website/permalink/author.rb b/app/models/communication/website/permalink/author.rb index 848cf48b9f19a26987c303d10faf7ba9f0eb0531..05a08cddec628aae85d6c2b36feddc7402516c16 100644 --- a/app/models/communication/website/permalink/author.rb +++ b/app/models/communication/website/permalink/author.rb @@ -1,5 +1,5 @@ class Communication::Website::Permalink::Author < Communication::Website::Permalink - def self.required_for_website?(website) + def self.required_in_config?(website) # website might have authors but no communication_posts (if a post unpublished exists) website.has_authors? && website.has_communication_posts? end diff --git a/app/models/communication/website/permalink/category.rb b/app/models/communication/website/permalink/category.rb index 89f797a3c37d9f4e0782a2e788f366b7bfc1986e..71d5a2481481219c0dac8a009dcc3890b50b3da8 100644 --- a/app/models/communication/website/permalink/category.rb +++ b/app/models/communication/website/permalink/category.rb @@ -1,5 +1,5 @@ class Communication::Website::Permalink::Category < Communication::Website::Permalink - def self.required_for_website?(website) + def self.required_in_config?(website) website.has_communication_posts? && website.has_communication_categories? end diff --git a/app/models/communication/website/permalink/diploma.rb b/app/models/communication/website/permalink/diploma.rb index ccf32fbbf4f6a4ab211e8c258a00e5ac1348bc16..15f47f5efa0262e5273fd897113d900d9ed6f850 100644 --- a/app/models/communication/website/permalink/diploma.rb +++ b/app/models/communication/website/permalink/diploma.rb @@ -1,5 +1,5 @@ class Communication::Website::Permalink::Diploma < Communication::Website::Permalink - def self.required_for_website?(website) + def self.required_in_config?(website) website.has_education_diplomas? end diff --git a/app/models/communication/website/permalink/organization.rb b/app/models/communication/website/permalink/organization.rb index fdd564a1a7cff285986a679432c3bad09f560dee..a068912dd84ee43bfe39d61ca6242757a6b06ac7 100644 --- a/app/models/communication/website/permalink/organization.rb +++ b/app/models/communication/website/permalink/organization.rb @@ -1,5 +1,5 @@ class Communication::Website::Permalink::Organization < Communication::Website::Permalink - def self.required_for_website?(website) + def self.required_in_config?(website) website.has_organizations? end diff --git a/app/models/communication/website/permalink/page.rb b/app/models/communication/website/permalink/page.rb index 1afa2991aa6d6ca3b6d5c147426e39e159d8d422..5cbf3bccb792a1e9122a7b9975e875f908b3b167 100644 --- a/app/models/communication/website/permalink/page.rb +++ b/app/models/communication/website/permalink/page.rb @@ -1,5 +1,5 @@ class Communication::Website::Permalink::Page < Communication::Website::Permalink - def self.required_for_website?(website) + def self.required_in_config?(website) false end diff --git a/app/models/communication/website/permalink/person.rb b/app/models/communication/website/permalink/person.rb index 9510fa77b92372bcc81ee80e77f3f213c261d96b..8923972943af4c226688a4a67ca5a98a1a844903 100644 --- a/app/models/communication/website/permalink/person.rb +++ b/app/models/communication/website/permalink/person.rb @@ -1,5 +1,5 @@ class Communication::Website::Permalink::Person < Communication::Website::Permalink - def self.required_for_website?(website) + def self.required_in_config?(website) website.has_persons? end diff --git a/app/models/communication/website/permalink/post.rb b/app/models/communication/website/permalink/post.rb index b03e273d10a3efa736c9dc0ceb6df9d9d20bf17a..ea9da6cac438db5747ede529ab97fd9ce15f0d50 100644 --- a/app/models/communication/website/permalink/post.rb +++ b/app/models/communication/website/permalink/post.rb @@ -1,5 +1,5 @@ class Communication::Website::Permalink::Post < Communication::Website::Permalink - def self.required_for_website?(website) + def self.required_in_config?(website) website.has_communication_posts? end diff --git a/app/models/communication/website/permalink/researcher.rb b/app/models/communication/website/permalink/researcher.rb index f9d52b05ee7d4fa914e0d6ed29cdf17a23edbba5..aff54ea27600cbdc083b2e848806f9be52dbe693 100644 --- a/app/models/communication/website/permalink/researcher.rb +++ b/app/models/communication/website/permalink/researcher.rb @@ -1,5 +1,5 @@ class Communication::Website::Permalink::Researcher < Communication::Website::Permalink - def self.required_for_website?(website) + def self.required_in_config?(website) website.has_researchers? end diff --git a/app/models/communication/website/permalink/teacher.rb b/app/models/communication/website/permalink/teacher.rb index de324a201b52fc1cb9e47e45b9e47ca727f96e5e..1e83e9971abdac664d35ed148d05b7e625da8991 100644 --- a/app/models/communication/website/permalink/teacher.rb +++ b/app/models/communication/website/permalink/teacher.rb @@ -1,5 +1,5 @@ class Communication::Website::Permalink::Teacher < Communication::Website::Permalink - def self.required_for_website?(website) + def self.required_in_config?(website) website.has_teachers? end