From 153c9163a7c6fba3e1a287ea1ac1b9234715e3c0 Mon Sep 17 00:00:00 2001 From: pabois <pierreandre.boissinot@noesya.coop> Date: Mon, 5 Dec 2022 15:21:14 +0100 Subject: [PATCH] rename methdo --- app/models/communication/website/permalink.rb | 2 +- app/models/communication/website/permalink/administrator.rb | 2 +- app/models/communication/website/permalink/author.rb | 2 +- app/models/communication/website/permalink/category.rb | 2 +- app/models/communication/website/permalink/diploma.rb | 2 +- app/models/communication/website/permalink/organization.rb | 2 +- app/models/communication/website/permalink/page.rb | 2 +- app/models/communication/website/permalink/person.rb | 2 +- app/models/communication/website/permalink/post.rb | 2 +- app/models/communication/website/permalink/researcher.rb | 2 +- app/models/communication/website/permalink/teacher.rb | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/app/models/communication/website/permalink.rb b/app/models/communication/website/permalink.rb index e3dd63852..92de93a1b 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 cfdbf6990..8eafca77b 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 848cf48b9..05a08cdde 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 89f797a3c..71d5a2481 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 ccf32fbbf..15f47f5ef 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 fdd564a1a..a068912dd 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 1afa2991a..5cbf3bccb 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 9510fa77b..892397294 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 b03e273d1..ea9da6cac 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 f9d52b05e..aff54ea27 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 de324a201..1e83e9971 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 -- GitLab