From 6eb2de1669e2d50d71c6746d6726f35d6cd557ee Mon Sep 17 00:00:00 2001
From: pabois <pierreandre.boissinot@noesya.coop>
Date: Mon, 9 Jan 2023 12:42:03 +0100
Subject: [PATCH] rename description_short as summary
---
.../websites/pages_controller.rb | 2 +-
.../websites/posts_controller.rb | 2 +-
.../admin/education/diplomas_controller.rb | 2 +-
.../admin/education/programs_controller.rb | 2 +-
.../university/organizations_controller.rb | 6 +--
.../admin/university/people_controller.rb | 2 +-
.../extranet/personal_data_controller.rb | 2 +-
app/models/communication/website/page.rb | 2 +-
.../website/page/accessibility.rb | 2 +-
.../website/page/administrator.rb | 2 +-
.../communication/website/page/author.rb | 2 +-
.../website/page/communication_post.rb | 2 +-
.../website/page/education_diploma.rb | 2 +-
.../website/page/education_program.rb | 2 +-
app/models/communication/website/page/home.rb | 2 +-
.../communication/website/page/legal_term.rb | 2 +-
.../website/page/organization.rb | 2 +-
.../communication/website/page/person.rb | 2 +-
.../website/page/privacy_policy.rb | 2 +-
.../website/page/research_paper.rb | 2 +-
.../website/page/research_volume.rb | 2 +-
.../communication/website/page/researcher.rb | 2 +-
.../communication/website/page/sitemap.rb | 2 +-
.../communication/website/page/teacher.rb | 2 +-
app/models/communication/website/post.rb | 4 +-
app/models/education/diploma.rb | 22 +++++-----
app/models/education/program.rb | 2 +-
app/models/university/organization.rb | 42 +++++++++----------
app/models/university/person.rb | 4 +-
app/models/university/person/administrator.rb | 2 +-
app/models/university/person/alumnus.rb | 2 +-
app/models/university/person/author.rb | 2 +-
app/models/university/person/researcher.rb | 2 +-
app/models/university/person/teacher.rb | 2 +-
.../admin/application/chapo/_form.html.erb | 6 +--
.../admin/application/chapo/_show.html.erb | 6 +--
.../admin/application/chapo/_static.html.erb | 5 ++-
.../blocks/templates/pages/_preview.html.erb | 4 +-
.../blocks/templates/posts/_preview.html.erb | 4 +-
.../admin/education/programs/show.html.erb | 9 +---
.../university/organizations/_form.html.erb | 2 +-
.../admin/university/people/_form.html.erb | 2 +-
.../university/people/_main_infos.html.erb | 4 --
config/locales/communication/en.yml | 4 +-
config/locales/communication/fr.yml | 6 +--
config/locales/education/en.yml | 12 +++---
config/locales/education/fr.yml | 12 +++---
config/locales/university/en.yml | 24 +++++------
config/locales/university/fr.yml | 24 +++++------
...701_rename_description_short_to_summary.rb | 10 +++++
db/schema.rb | 14 +++----
test/fixtures/communication/website/posts.yml | 2 +-
test/fixtures/education/diplomas.yml | 22 +++++-----
test/fixtures/university/organizations.yml | 42 +++++++++----------
test/models/education/diploma_test.rb | 22 +++++-----
test/models/university/organization_test.rb | 42 +++++++++----------
56 files changed, 209 insertions(+), 205 deletions(-)
create mode 100644 db/migrate/20230109110701_rename_description_short_to_summary.rb
diff --git a/app/controllers/admin/communication/websites/pages_controller.rb b/app/controllers/admin/communication/websites/pages_controller.rb
index 94cb1747c..d05b57beb 100644
--- a/app/controllers/admin/communication/websites/pages_controller.rb
+++ b/app/controllers/admin/communication/websites/pages_controller.rb
@@ -102,7 +102,7 @@ class Admin::Communication::Websites::PagesController < Admin::Communication::We
params.require(:communication_website_page)
.permit(
:communication_website_id, :title, :breadcrumb_title, :bodyclass,
- :description, :description_short, :header_text, :text, :slug, :published, :full_width,
+ :description, :summary, :header_text, :text, :slug, :published, :full_width,
:featured_image, :featured_image_delete, :featured_image_infos, :featured_image_alt, :featured_image_credit,
:parent_id, :language_id
)
diff --git a/app/controllers/admin/communication/websites/posts_controller.rb b/app/controllers/admin/communication/websites/posts_controller.rb
index 0b432a856..24e2ee377 100644
--- a/app/controllers/admin/communication/websites/posts_controller.rb
+++ b/app/controllers/admin/communication/websites/posts_controller.rb
@@ -95,7 +95,7 @@ class Admin::Communication::Websites::PostsController < Admin::Communication::We
def post_params
params.require(:communication_website_post)
.permit(
- :university_id, :website_id, :title, :description, :description_short, :text,
+ :university_id, :website_id, :title, :description, :summary, :text,
:published, :published_at, :slug, :pinned,
:featured_image, :featured_image_delete, :featured_image_infos, :featured_image_alt, :featured_image_credit,
:author_id, :language_id, category_ids: []
diff --git a/app/controllers/admin/education/diplomas_controller.rb b/app/controllers/admin/education/diplomas_controller.rb
index 7daecf169..0898fac6f 100644
--- a/app/controllers/admin/education/diplomas_controller.rb
+++ b/app/controllers/admin/education/diplomas_controller.rb
@@ -64,6 +64,6 @@ class Admin::Education::DiplomasController < Admin::Education::ApplicationContro
def diploma_params
params.require(:education_diploma)
- .permit(:name, :short_name, :description_short, :level, :ects, :duration)
+ .permit(:name, :short_name, :summary, :level, :ects, :duration)
end
end
diff --git a/app/controllers/admin/education/programs_controller.rb b/app/controllers/admin/education/programs_controller.rb
index 8d8638ab5..f754feff8 100644
--- a/app/controllers/admin/education/programs_controller.rb
+++ b/app/controllers/admin/education/programs_controller.rb
@@ -110,7 +110,7 @@ class Admin::Education::ProgramsController < Admin::Education::ApplicationContro
def program_params
params.require(:education_program).permit(
- :name, :short_name, :slug, :capacity, :continuing, :initial, :apprenticeship, :description, :description_short, :published,
+ :name, :short_name, :slug, :capacity, :continuing, :initial, :apprenticeship, :description, :summary, :published,
:featured_image, :featured_image_delete, :featured_image_infos, :featured_image_alt, :featured_image_credit,
:prerequisites, :objectives, :presentation, :registration, :pedagogy, :content, :registration_url,
:evaluation, :accessibility, :pricing, :contacts, :opportunities, :results, :other, :main_information,
diff --git a/app/controllers/admin/university/organizations_controller.rb b/app/controllers/admin/university/organizations_controller.rb
index c08bf99f4..751395e80 100644
--- a/app/controllers/admin/university/organizations_controller.rb
+++ b/app/controllers/admin/university/organizations_controller.rb
@@ -69,11 +69,11 @@ class Admin::University::OrganizationsController < Admin::University::Applicatio
def organization_params
params.require(:university_organization)
.permit(
- :name, :long_name, :slug, :description, :description_short, :active, :siren, :kind,
+ :name, :long_name, :slug, :description, :summary, :active, :siren, :kind,
:address, :zipcode, :city, :country, :text,
:url, :phone, :email,
- :logo, :logo_delete, :logo_infos,
- :logo_on_dark_background, :logo_on_dark_background_delete, :logo_on_dark_background_infos,
+ :logo, :logo_delete, :logo_infos,
+ :logo_on_dark_background, :logo_on_dark_background_delete, :logo_on_dark_background_infos,
)
end
end
diff --git a/app/controllers/admin/university/people_controller.rb b/app/controllers/admin/university/people_controller.rb
index 63e11047b..f6449552b 100644
--- a/app/controllers/admin/university/people_controller.rb
+++ b/app/controllers/admin/university/people_controller.rb
@@ -74,7 +74,7 @@ class Admin::University::PeopleController < Admin::University::ApplicationContro
:slug, :first_name, :last_name, :email, :gender, :birthdate,
:phone_mobile, :phone_professional, :phone_personal,
:address, :zipcode, :city, :country,
- :description, :description_short,
+ :description, :summary,
:biography, :picture, :picture_delete, :picture_infos,
:habilitation, :tenure, :url, :linkedin, :twitter,
:is_researcher, :is_teacher, :is_administration, :is_alumnus,
diff --git a/app/controllers/extranet/personal_data_controller.rb b/app/controllers/extranet/personal_data_controller.rb
index 62e632303..0da2e83a6 100644
--- a/app/controllers/extranet/personal_data_controller.rb
+++ b/app/controllers/extranet/personal_data_controller.rb
@@ -26,7 +26,7 @@ class Extranet::PersonalDataController < Extranet::ApplicationController
def person_params
params.require(:university_person)
.permit(
- :gender, :birthdate, :description_short, :biography,
+ :gender, :birthdate, :summary, :biography,
:phone_mobile, :phone_professional, :phone_personal,
:address, :zipcode, :city, :country,
:url, :linkedin, :twitter
diff --git a/app/models/communication/website/page.rb b/app/models/communication/website/page.rb
index 8997909a2..2a37ec772 100644
--- a/app/models/communication/website/page.rb
+++ b/app/models/communication/website/page.rb
@@ -6,7 +6,6 @@
# bodyclass :string
# breadcrumb_title :string
# description :text
-# description_short :text
# featured_image_alt :string
# featured_image_credit :text
# full_width :boolean default(FALSE)
@@ -16,6 +15,7 @@
# position :integer default(0), not null
# published :boolean default(FALSE)
# slug :string
+# summary :text
# text :text
# title :string
# type :string
diff --git a/app/models/communication/website/page/accessibility.rb b/app/models/communication/website/page/accessibility.rb
index fc13d78e0..0160fadeb 100644
--- a/app/models/communication/website/page/accessibility.rb
+++ b/app/models/communication/website/page/accessibility.rb
@@ -6,7 +6,6 @@
# bodyclass :string
# breadcrumb_title :string
# description :text
-# description_short :text
# featured_image_alt :string
# featured_image_credit :text
# full_width :boolean default(FALSE)
@@ -16,6 +15,7 @@
# position :integer default(0), not null
# published :boolean default(FALSE)
# slug :string
+# summary :text
# text :text
# title :string
# type :string
diff --git a/app/models/communication/website/page/administrator.rb b/app/models/communication/website/page/administrator.rb
index f1372fa60..c6b1ff524 100644
--- a/app/models/communication/website/page/administrator.rb
+++ b/app/models/communication/website/page/administrator.rb
@@ -6,7 +6,6 @@
# bodyclass :string
# breadcrumb_title :string
# description :text
-# description_short :text
# featured_image_alt :string
# featured_image_credit :text
# full_width :boolean default(FALSE)
@@ -16,6 +15,7 @@
# position :integer default(0), not null
# published :boolean default(FALSE)
# slug :string
+# summary :text
# text :text
# title :string
# type :string
diff --git a/app/models/communication/website/page/author.rb b/app/models/communication/website/page/author.rb
index c759a1d04..1c85fbc4c 100644
--- a/app/models/communication/website/page/author.rb
+++ b/app/models/communication/website/page/author.rb
@@ -6,7 +6,6 @@
# bodyclass :string
# breadcrumb_title :string
# description :text
-# description_short :text
# featured_image_alt :string
# featured_image_credit :text
# full_width :boolean default(FALSE)
@@ -16,6 +15,7 @@
# position :integer default(0), not null
# published :boolean default(FALSE)
# slug :string
+# summary :text
# text :text
# title :string
# type :string
diff --git a/app/models/communication/website/page/communication_post.rb b/app/models/communication/website/page/communication_post.rb
index fffa8c896..4ea17f020 100644
--- a/app/models/communication/website/page/communication_post.rb
+++ b/app/models/communication/website/page/communication_post.rb
@@ -6,7 +6,6 @@
# bodyclass :string
# breadcrumb_title :string
# description :text
-# description_short :text
# featured_image_alt :string
# featured_image_credit :text
# full_width :boolean default(FALSE)
@@ -16,6 +15,7 @@
# position :integer default(0), not null
# published :boolean default(FALSE)
# slug :string
+# summary :text
# text :text
# title :string
# type :string
diff --git a/app/models/communication/website/page/education_diploma.rb b/app/models/communication/website/page/education_diploma.rb
index 70741dd42..fa0ab72e5 100644
--- a/app/models/communication/website/page/education_diploma.rb
+++ b/app/models/communication/website/page/education_diploma.rb
@@ -6,7 +6,6 @@
# bodyclass :string
# breadcrumb_title :string
# description :text
-# description_short :text
# featured_image_alt :string
# featured_image_credit :text
# full_width :boolean default(FALSE)
@@ -16,6 +15,7 @@
# position :integer default(0), not null
# published :boolean default(FALSE)
# slug :string
+# summary :text
# text :text
# title :string
# type :string
diff --git a/app/models/communication/website/page/education_program.rb b/app/models/communication/website/page/education_program.rb
index 105ec7616..5c4614e69 100644
--- a/app/models/communication/website/page/education_program.rb
+++ b/app/models/communication/website/page/education_program.rb
@@ -6,7 +6,6 @@
# bodyclass :string
# breadcrumb_title :string
# description :text
-# description_short :text
# featured_image_alt :string
# featured_image_credit :text
# full_width :boolean default(FALSE)
@@ -16,6 +15,7 @@
# position :integer default(0), not null
# published :boolean default(FALSE)
# slug :string
+# summary :text
# text :text
# title :string
# type :string
diff --git a/app/models/communication/website/page/home.rb b/app/models/communication/website/page/home.rb
index 5a32844fc..99e1db8ea 100644
--- a/app/models/communication/website/page/home.rb
+++ b/app/models/communication/website/page/home.rb
@@ -6,7 +6,6 @@
# bodyclass :string
# breadcrumb_title :string
# description :text
-# description_short :text
# featured_image_alt :string
# featured_image_credit :text
# full_width :boolean default(FALSE)
@@ -16,6 +15,7 @@
# position :integer default(0), not null
# published :boolean default(FALSE)
# slug :string
+# summary :text
# text :text
# title :string
# type :string
diff --git a/app/models/communication/website/page/legal_term.rb b/app/models/communication/website/page/legal_term.rb
index 4fcb1e8e7..60b88b52f 100644
--- a/app/models/communication/website/page/legal_term.rb
+++ b/app/models/communication/website/page/legal_term.rb
@@ -6,7 +6,6 @@
# bodyclass :string
# breadcrumb_title :string
# description :text
-# description_short :text
# featured_image_alt :string
# featured_image_credit :text
# full_width :boolean default(FALSE)
@@ -16,6 +15,7 @@
# position :integer default(0), not null
# published :boolean default(FALSE)
# slug :string
+# summary :text
# text :text
# title :string
# type :string
diff --git a/app/models/communication/website/page/organization.rb b/app/models/communication/website/page/organization.rb
index a3aadb646..daa23083d 100644
--- a/app/models/communication/website/page/organization.rb
+++ b/app/models/communication/website/page/organization.rb
@@ -6,7 +6,6 @@
# bodyclass :string
# breadcrumb_title :string
# description :text
-# description_short :text
# featured_image_alt :string
# featured_image_credit :text
# full_width :boolean default(FALSE)
@@ -16,6 +15,7 @@
# position :integer default(0), not null
# published :boolean default(FALSE)
# slug :string
+# summary :text
# text :text
# title :string
# type :string
diff --git a/app/models/communication/website/page/person.rb b/app/models/communication/website/page/person.rb
index 532a81d8f..b4fd596b4 100644
--- a/app/models/communication/website/page/person.rb
+++ b/app/models/communication/website/page/person.rb
@@ -6,7 +6,6 @@
# bodyclass :string
# breadcrumb_title :string
# description :text
-# description_short :text
# featured_image_alt :string
# featured_image_credit :text
# full_width :boolean default(FALSE)
@@ -16,6 +15,7 @@
# position :integer default(0), not null
# published :boolean default(FALSE)
# slug :string
+# summary :text
# text :text
# title :string
# type :string
diff --git a/app/models/communication/website/page/privacy_policy.rb b/app/models/communication/website/page/privacy_policy.rb
index 81f934737..dedba6f17 100644
--- a/app/models/communication/website/page/privacy_policy.rb
+++ b/app/models/communication/website/page/privacy_policy.rb
@@ -6,7 +6,6 @@
# bodyclass :string
# breadcrumb_title :string
# description :text
-# description_short :text
# featured_image_alt :string
# featured_image_credit :text
# full_width :boolean default(FALSE)
@@ -16,6 +15,7 @@
# position :integer default(0), not null
# published :boolean default(FALSE)
# slug :string
+# summary :text
# text :text
# title :string
# type :string
diff --git a/app/models/communication/website/page/research_paper.rb b/app/models/communication/website/page/research_paper.rb
index 7a1cbda05..2ebe4ddf3 100644
--- a/app/models/communication/website/page/research_paper.rb
+++ b/app/models/communication/website/page/research_paper.rb
@@ -6,7 +6,6 @@
# bodyclass :string
# breadcrumb_title :string
# description :text
-# description_short :text
# featured_image_alt :string
# featured_image_credit :text
# full_width :boolean default(FALSE)
@@ -16,6 +15,7 @@
# position :integer default(0), not null
# published :boolean default(FALSE)
# slug :string
+# summary :text
# text :text
# title :string
# type :string
diff --git a/app/models/communication/website/page/research_volume.rb b/app/models/communication/website/page/research_volume.rb
index a893a5dfb..dc3e3fb9e 100644
--- a/app/models/communication/website/page/research_volume.rb
+++ b/app/models/communication/website/page/research_volume.rb
@@ -6,7 +6,6 @@
# bodyclass :string
# breadcrumb_title :string
# description :text
-# description_short :text
# featured_image_alt :string
# featured_image_credit :text
# full_width :boolean default(FALSE)
@@ -16,6 +15,7 @@
# position :integer default(0), not null
# published :boolean default(FALSE)
# slug :string
+# summary :text
# text :text
# title :string
# type :string
diff --git a/app/models/communication/website/page/researcher.rb b/app/models/communication/website/page/researcher.rb
index 1ca11e144..36748be37 100644
--- a/app/models/communication/website/page/researcher.rb
+++ b/app/models/communication/website/page/researcher.rb
@@ -6,7 +6,6 @@
# bodyclass :string
# breadcrumb_title :string
# description :text
-# description_short :text
# featured_image_alt :string
# featured_image_credit :text
# full_width :boolean default(FALSE)
@@ -16,6 +15,7 @@
# position :integer default(0), not null
# published :boolean default(FALSE)
# slug :string
+# summary :text
# text :text
# title :string
# type :string
diff --git a/app/models/communication/website/page/sitemap.rb b/app/models/communication/website/page/sitemap.rb
index 97f15c8f4..984270140 100644
--- a/app/models/communication/website/page/sitemap.rb
+++ b/app/models/communication/website/page/sitemap.rb
@@ -6,7 +6,6 @@
# bodyclass :string
# breadcrumb_title :string
# description :text
-# description_short :text
# featured_image_alt :string
# featured_image_credit :text
# full_width :boolean default(FALSE)
@@ -16,6 +15,7 @@
# position :integer default(0), not null
# published :boolean default(FALSE)
# slug :string
+# summary :text
# text :text
# title :string
# type :string
diff --git a/app/models/communication/website/page/teacher.rb b/app/models/communication/website/page/teacher.rb
index 589936078..447a5c87a 100644
--- a/app/models/communication/website/page/teacher.rb
+++ b/app/models/communication/website/page/teacher.rb
@@ -6,7 +6,6 @@
# bodyclass :string
# breadcrumb_title :string
# description :text
-# description_short :text
# featured_image_alt :string
# featured_image_credit :text
# full_width :boolean default(FALSE)
@@ -16,6 +15,7 @@
# position :integer default(0), not null
# published :boolean default(FALSE)
# slug :string
+# summary :text
# text :text
# title :string
# type :string
diff --git a/app/models/communication/website/post.rb b/app/models/communication/website/post.rb
index 17cfd60cc..5c3644455 100644
--- a/app/models/communication/website/post.rb
+++ b/app/models/communication/website/post.rb
@@ -4,7 +4,6 @@
#
# id :uuid not null, primary key
# description :text
-# description_short :text
# featured_image_alt :string
# featured_image_credit :text
# github_path :text
@@ -12,6 +11,7 @@
# published :boolean default(FALSE)
# published_at :datetime
# slug :text
+# summary :text
# text :text
# title :string
# created_at :datetime not null
@@ -88,7 +88,7 @@ class Communication::Website::Post < ApplicationRecord
scope :for_search_term, -> (term) {
where("
unaccent(communication_website_posts.description) ILIKE unaccent(:term) OR
- unaccent(communication_website_posts.description_short) ILIKE unaccent(:term) OR
+ unaccent(communication_website_posts.summary) ILIKE unaccent(:term) OR
unaccent(communication_website_posts.text) ILIKE unaccent(:term) OR
unaccent(communication_website_posts.title) ILIKE unaccent(:term)
", term: "%#{sanitize_sql_like(term)}%")
diff --git a/app/models/education/diploma.rb b/app/models/education/diploma.rb
index 614f4afd8..f01e1db3b 100644
--- a/app/models/education/diploma.rb
+++ b/app/models/education/diploma.rb
@@ -2,17 +2,17 @@
#
# Table name: education_diplomas
#
-# id :uuid not null, primary key
-# description_short :text
-# duration :text
-# ects :integer
-# level :integer default("not_applicable")
-# name :string
-# short_name :string
-# slug :string
-# created_at :datetime not null
-# updated_at :datetime not null
-# university_id :uuid not null, indexed
+# id :uuid not null, primary key
+# duration :text
+# ects :integer
+# level :integer default("not_applicable")
+# name :string
+# short_name :string
+# slug :string
+# summary :text
+# created_at :datetime not null
+# updated_at :datetime not null
+# university_id :uuid not null, indexed
#
# Indexes
#
diff --git a/app/models/education/program.rb b/app/models/education/program.rb
index 9cfa03597..7383b2412 100644
--- a/app/models/education/program.rb
+++ b/app/models/education/program.rb
@@ -10,7 +10,6 @@
# content :text
# continuing :boolean
# description :text
-# description_short :text
# duration :text
# evaluation :text
# featured_image_alt :string
@@ -32,6 +31,7 @@
# results :text
# short_name :string
# slug :string
+# summary :text
# created_at :datetime not null
# updated_at :datetime not null
# diploma_id :uuid indexed
diff --git a/app/models/university/organization.rb b/app/models/university/organization.rb
index d135675b0..0d0c3e53b 100644
--- a/app/models/university/organization.rb
+++ b/app/models/university/organization.rb
@@ -2,27 +2,27 @@
#
# Table name: university_organizations
#
-# id :uuid not null, primary key
-# active :boolean default(TRUE)
-# address :string
-# city :string
-# country :string
-# description :text
-# description_short :text
-# email :string
-# kind :integer default("company")
-# long_name :string
-# name :string
-# nic :string
-# phone :string
-# siren :string
-# slug :string
-# text :text
-# url :string
-# zipcode :string
-# created_at :datetime not null
-# updated_at :datetime not null
-# university_id :uuid not null, indexed
+# id :uuid not null, primary key
+# active :boolean default(TRUE)
+# address :string
+# city :string
+# country :string
+# description :text
+# email :string
+# kind :integer default("company")
+# long_name :string
+# name :string
+# nic :string
+# phone :string
+# siren :string
+# slug :string
+# summary :text
+# text :text
+# url :string
+# zipcode :string
+# created_at :datetime not null
+# updated_at :datetime not null
+# university_id :uuid not null, indexed
#
# Indexes
#
diff --git a/app/models/university/person.rb b/app/models/university/person.rb
index 665f93288..21b9d381e 100644
--- a/app/models/university/person.rb
+++ b/app/models/university/person.rb
@@ -9,7 +9,6 @@
# city :string
# country :string
# description :text
-# description_short :text
# email :string
# first_name :string
# gender :integer
@@ -26,6 +25,7 @@
# phone_personal :string
# phone_professional :string
# slug :string
+# summary :text
# tenure :boolean default(FALSE)
# twitter :string
# url :string
@@ -148,7 +148,7 @@ class University::Person < ApplicationRecord
unaccent(university_people.phone_professional) ILIKE unaccent(:term) OR
unaccent(university_people.biography) ILIKE unaccent(:term) OR
unaccent(university_people.description) ILIKE unaccent(:term) OR
- unaccent(university_people.description_short) ILIKE unaccent(:term) OR
+ unaccent(university_people.summary) ILIKE unaccent(:term) OR
unaccent(university_people.twitter) ILIKE unaccent(:term) OR
unaccent(university_people.linkedin) ILIKE unaccent(:term) OR
unaccent(university_people.address) ILIKE unaccent(:term) OR
diff --git a/app/models/university/person/administrator.rb b/app/models/university/person/administrator.rb
index d90758a24..a32e33685 100644
--- a/app/models/university/person/administrator.rb
+++ b/app/models/university/person/administrator.rb
@@ -9,7 +9,6 @@
# city :string
# country :string
# description :text
-# description_short :text
# email :string
# first_name :string
# gender :integer
@@ -26,6 +25,7 @@
# phone_personal :string
# phone_professional :string
# slug :string
+# summary :text
# tenure :boolean default(FALSE)
# twitter :string
# url :string
diff --git a/app/models/university/person/alumnus.rb b/app/models/university/person/alumnus.rb
index 028735cba..9f7cbdf10 100644
--- a/app/models/university/person/alumnus.rb
+++ b/app/models/university/person/alumnus.rb
@@ -9,7 +9,6 @@
# city :string
# country :string
# description :text
-# description_short :text
# email :string
# first_name :string
# gender :integer
@@ -26,6 +25,7 @@
# phone_personal :string
# phone_professional :string
# slug :string
+# summary :text
# tenure :boolean default(FALSE)
# twitter :string
# url :string
diff --git a/app/models/university/person/author.rb b/app/models/university/person/author.rb
index a41fe14bf..247e50027 100644
--- a/app/models/university/person/author.rb
+++ b/app/models/university/person/author.rb
@@ -9,7 +9,6 @@
# city :string
# country :string
# description :text
-# description_short :text
# email :string
# first_name :string
# gender :integer
@@ -26,6 +25,7 @@
# phone_personal :string
# phone_professional :string
# slug :string
+# summary :text
# tenure :boolean default(FALSE)
# twitter :string
# url :string
diff --git a/app/models/university/person/researcher.rb b/app/models/university/person/researcher.rb
index 2a54ba57d..1abe5abdb 100644
--- a/app/models/university/person/researcher.rb
+++ b/app/models/university/person/researcher.rb
@@ -9,7 +9,6 @@
# city :string
# country :string
# description :text
-# description_short :text
# email :string
# first_name :string
# gender :integer
@@ -26,6 +25,7 @@
# phone_personal :string
# phone_professional :string
# slug :string
+# summary :text
# tenure :boolean default(FALSE)
# twitter :string
# url :string
diff --git a/app/models/university/person/teacher.rb b/app/models/university/person/teacher.rb
index 7d7476461..4f5e67355 100644
--- a/app/models/university/person/teacher.rb
+++ b/app/models/university/person/teacher.rb
@@ -9,7 +9,6 @@
# city :string
# country :string
# description :text
-# description_short :text
# email :string
# first_name :string
# gender :integer
@@ -26,6 +25,7 @@
# phone_personal :string
# phone_professional :string
# slug :string
+# summary :text
# tenure :boolean default(FALSE)
# twitter :string
# url :string
diff --git a/app/views/admin/application/chapo/_form.html.erb b/app/views/admin/application/chapo/_form.html.erb
index d0c17e7fc..7cab9cc08 100644
--- a/app/views/admin/application/chapo/_form.html.erb
+++ b/app/views/admin/application/chapo/_form.html.erb
@@ -1,4 +1,4 @@
-<%= f.input :description_short,
- input_html: {
- value: about.description_short&.gsub('&', '&')
+<%= f.input :summary,
+ input_html: {
+ value: about.summary&.gsub('&', '&')
} %>
diff --git a/app/views/admin/application/chapo/_show.html.erb b/app/views/admin/application/chapo/_show.html.erb
index 9730ef2d4..2a5761230 100644
--- a/app/views/admin/application/chapo/_show.html.erb
+++ b/app/views/admin/application/chapo/_show.html.erb
@@ -1,11 +1,11 @@
-<% unless about.description_short.blank? %>
+<% unless about.summary.blank? %>
<div class="card flex-fill w-100">
<div class="card-header">
- <h2 class="card-title mb-0 h5"><%= about.class.human_attribute_name('description_short') %></h2>
+ <h2 class="card-title mb-0 h5"><%= about.class.human_attribute_name('summary') %></h2>
</div>
<div class="card-body">
<p class="lead">
- <%= sanitize about.description_short %>
+ <%= sanitize about.summary %>
</p>
</div>
</div>
diff --git a/app/views/admin/application/chapo/_static.html.erb b/app/views/admin/application/chapo/_static.html.erb
index 588ada7e1..a90e39b22 100644
--- a/app/views/admin/application/chapo/_static.html.erb
+++ b/app/views/admin/application/chapo/_static.html.erb
@@ -1,2 +1,5 @@
+summary: >
+ <%= prepare_text_for_static @about.summary %>
+<%# TODO: legacy: remove when theme doesn't use description_short anymore %>
description_short: >
- <%= prepare_text_for_static @about.description_short %>
+ <%= prepare_text_for_static @about.summary %>
diff --git a/app/views/admin/communication/blocks/templates/pages/_preview.html.erb b/app/views/admin/communication/blocks/templates/pages/_preview.html.erb
index a6d774fc3..e6f7fbbc3 100644
--- a/app/views/admin/communication/blocks/templates/pages/_preview.html.erb
+++ b/app/views/admin/communication/blocks/templates/pages/_preview.html.erb
@@ -12,9 +12,9 @@
class: 'img-fluid mb-3' %>
<% end %>
<% if @block.template.show_description %>
- <p><%= element.description_short %></p>
+ <p><%= element.summary %></p>
<% end %>
</div>
<% end %>
</div>
-<% end %>
\ No newline at end of file
+<% end %>
diff --git a/app/views/admin/communication/blocks/templates/posts/_preview.html.erb b/app/views/admin/communication/blocks/templates/posts/_preview.html.erb
index 61501a272..f6e2422c3 100644
--- a/app/views/admin/communication/blocks/templates/posts/_preview.html.erb
+++ b/app/views/admin/communication/blocks/templates/posts/_preview.html.erb
@@ -5,7 +5,7 @@
<article class="post">
<div>
<p class="title"><%= post %></p>
- <p><%= post.description_short %></p>
+ <p><%= post.summary %></p>
<time datetime="<%= post.published_at %>"><%= post.published_at.to_date %></time>
</div>
<% if post.best_featured_image.attached? %>
@@ -17,4 +17,4 @@
</div>
<% end %>
<% end %>
-</div>
\ No newline at end of file
+</div>
diff --git a/app/views/admin/education/programs/show.html.erb b/app/views/admin/education/programs/show.html.erb
index bb849cad0..711efc391 100644
--- a/app/views/admin/education/programs/show.html.erb
+++ b/app/views/admin/education/programs/show.html.erb
@@ -2,6 +2,7 @@
<div class="row">
<div class="col-lg-8 col-xxl-9">
+ <%= render 'admin/application/chapo/show', about: @program %>
<%= render 'admin/education/programs/forms/part',
part: :essential,
collapsed: false do %>
@@ -15,12 +16,6 @@
<%= Education::Program.human_attribute_name('diploma') %>
</h3>
<p><%= link_to @program.diploma, [:admin, @program.diploma] if @program.diploma %></p>
- <h3 class="h5 mt-4">
- <%= Education::Program.human_attribute_name('description_short') %>
- </h3>
- <p class="lead">
- <%= sanitize @program.description_short %>
- </p>
<% if @program.schools.any? %>
<h3 class="h5 mt-4">
<%= Education::Program.human_attribute_name('schools') %>
@@ -58,7 +53,7 @@
<%= Education::Program.human_attribute_name('downloadable_summary') %>
</h3>
<p><%= link_to "#{@program.downloadable_summary.filename} (#{ number_to_human_size @program.downloadable_summary.blob.byte_size })",
- url_for(@program.downloadable_summary),
+ url_for(@program.downloadable_summary),
target: :_blank %></p>
<% end %>
</div>
diff --git a/app/views/admin/university/organizations/_form.html.erb b/app/views/admin/university/organizations/_form.html.erb
index 8ed0a659f..446aa17e9 100644
--- a/app/views/admin/university/organizations/_form.html.erb
+++ b/app/views/admin/university/organizations/_form.html.erb
@@ -10,7 +10,7 @@
</div>
<div class="card-body">
<%= f.input :name %>
- <%= f.input :description_short %>
+ <%= render 'admin/application/chapo/form', f: f, about: organization %>
<%= f.input :text,
as: :summernote,
input_html: {
diff --git a/app/views/admin/university/people/_form.html.erb b/app/views/admin/university/people/_form.html.erb
index e2db4f3ec..a125c11ed 100644
--- a/app/views/admin/university/people/_form.html.erb
+++ b/app/views/admin/university/people/_form.html.erb
@@ -27,7 +27,7 @@
<%= f.input :birthdate, discard_year: true, include_blank: true %>
</div>
</div>
- <%= f.input :description_short %>
+ <%= render 'admin/application/chapo/form', f: f, about: person %>
<%= f.input :biography,
as: :summernote,
input_html: {
diff --git a/app/views/admin/university/people/_main_infos.html.erb b/app/views/admin/university/people/_main_infos.html.erb
index 505285595..016cd366c 100644
--- a/app/views/admin/university/people/_main_infos.html.erb
+++ b/app/views/admin/university/people/_main_infos.html.erb
@@ -32,10 +32,6 @@
<p><%= value %></p>
<% end %>
- <% unless person.description_short.blank? %>
- <h3 class="h5"><%= University::Person.human_attribute_name('description_short') %></h3>
- <%= simple_format person.description_short %>
- <% end %>
<% unless person.biography.blank? %>
<h3 class="h5"><%= University::Person.human_attribute_name('biography') %></h3>
<%= person.biography %>
diff --git a/config/locales/communication/en.yml b/config/locales/communication/en.yml
index 4922963ac..1a29bf58b 100644
--- a/config/locales/communication/en.yml
+++ b/config/locales/communication/en.yml
@@ -114,7 +114,6 @@ en:
breadcrumb_title: Title in breadcrumbs
children: Children pages
description: Meta description
- description_short: Lead text
featured_image: Featured image
featured_image_alt: Alt text
full_width: Full width
@@ -124,6 +123,7 @@ en:
published: Published?
related_category: Related category
slug: Slug
+ summary: Summary
text: Main page text
title: Title
website: Website
@@ -132,7 +132,6 @@ en:
category: Category
categories: Categories
description: Meta description
- description_short: Lead text
featured_image: Featured image
featured_image_alt: Alt text
featured_image_credit: Credit
@@ -140,6 +139,7 @@ en:
published: Published?
published_at: Publication date
slug: Slug
+ summary: Summary
text: Text
title: Title
website: Website
diff --git a/config/locales/communication/fr.yml b/config/locales/communication/fr.yml
index 5d056fb34..57a6f9004 100644
--- a/config/locales/communication/fr.yml
+++ b/config/locales/communication/fr.yml
@@ -114,7 +114,6 @@ fr:
breadcrumb_title: Nom affiché dans le fil d'ariane
children: Pages enfants
description: Description pour le référencement naturel
- description_short: Chapô
featured_image: Image à la une
featured_image_alt: Texte alternatif
full_width: Pleine largeur
@@ -124,6 +123,7 @@ fr:
published: Publié ?
related_category: Catégorie liée
slug: Identifiant
+ summary: Résumé
text: Texte principal de la page
title: Titre
website: Site Web
@@ -132,7 +132,6 @@ fr:
category: Catégorie
categories: Catégories
description: Description pour le référencement naturel
- description_short: Chapô
featured_image: Image à la une
featured_image_alt: Texte alternatif
featured_image_credit: Crédit
@@ -140,6 +139,7 @@ fr:
published: Publié ?
published_at: Date de publication
slug: Identifiant
+ summary: Résumé
text: Texte
title: Titre
website: Site Web
@@ -593,7 +593,7 @@ fr:
slug: formations
title: "Formations"
home:
- slug:
+ slug:
title: Accueil
legal_term:
slug: mentions-legales
diff --git a/config/locales/education/en.yml b/config/locales/education/en.yml
index d758b6f56..8346aa9bb 100644
--- a/config/locales/education/en.yml
+++ b/config/locales/education/en.yml
@@ -28,13 +28,13 @@ en:
school: School
year: Year
education/diploma:
- name: Name
- short_name: Short name
- level: Level
- programs: Programs
duration: Duration
ects: ECTS
- description_short: Lead text
+ level: Level
+ name: Name
+ programs: Programs
+ short_name: Short name
+ summary: Summary
education/program:
accessibility: Accessibilité
apprenticeship: Apprenticeship
@@ -42,7 +42,6 @@ en:
contacts: Contacts
continuing: Continuing training
description: Meta Description
- description_short: Lead text
diploma: Diploma
duration: Duration
downloadable_summary: Downloadable summary
@@ -66,6 +65,7 @@ en:
roles: Roles
schools: Schools with this formation
short_name: Short name
+ summary: Summary
teachers: Teachers
team: Team
content: Program's content
diff --git a/config/locales/education/fr.yml b/config/locales/education/fr.yml
index 5271cc3ae..ffe485422 100644
--- a/config/locales/education/fr.yml
+++ b/config/locales/education/fr.yml
@@ -28,13 +28,13 @@ fr:
school: École
year: Année
education/diploma:
- name: Nom
- short_name: Nom abrégé
- level: Niveau
- programs: Formations
duration: Durée
ects: Crédits ECTS
- description_short: Chapô
+ level: Niveau
+ name: Nom
+ programs: Formations
+ short_name: Nom abrégé
+ summary: Résumé
education/program:
accessibility: Accessibilité
apprenticeship: Apprentissage
@@ -42,7 +42,6 @@ fr:
contacts: Contacts
continuing: Formation continue
description: Meta Description
- description_short: Chapô
diploma: Diplôme
duration: Durée
downloadable_summary: Document de synthèse téléchargeable
@@ -66,6 +65,7 @@ fr:
roles: Rôles
schools: Écoles proposant cette formation
short_name: Nom abrégé
+ summary: Résumé
teachers: Enseignants·es
team: Équipe
content: Contenus de la formation
diff --git a/config/locales/university/en.yml b/config/locales/university/en.yml
index 52fd1f628..179675e12 100644
--- a/config/locales/university/en.yml
+++ b/config/locales/university/en.yml
@@ -35,7 +35,6 @@ en:
contacts: Contact information
country: Country
description: Meta description
- description_short: Lead text
education_programs: Programs
email: Email
essentials: Essentials
@@ -63,6 +62,7 @@ en:
roles: Roles
slug: Slug
socials: Socials
+ summary: Summary
teacher: Teacher
tenure: Has tenure?
twitter: Twitter username
@@ -81,24 +81,24 @@ en:
person: Person
target_id: ''
university/organization:
- name: Name
- long_name: Long name
- description: Meta description
- description_short: Lead text
- text: Text
- contact: Contact information
- legal: Legal information
address: Address
- zipcode: Zipcode
city: City
+ contact: Contact information
country: Country
- url: Website
- phone: Telephone
+ description: Meta description
email: Email
+ kind: Kind
+ legal: Legal information
logo: Logo for light backgrounds (default)
logo_on_dark_background: Logo for dark backgrounds (optional)
- kind: Kind
+ long_name: Long name
+ name: Name
+ phone: Telephone
siren: Legal identification number
+ summary: Summary
+ text: Text
+ url: Website
+ zipcode: Zipcode
university/role:
description: Description
people: People
diff --git a/config/locales/university/fr.yml b/config/locales/university/fr.yml
index f97f306a5..a9e99348c 100644
--- a/config/locales/university/fr.yml
+++ b/config/locales/university/fr.yml
@@ -35,7 +35,6 @@ fr:
contacts: Coordonnées
country: Pays
description: Meta description
- description_short: Chapô
education_programs: Formations
email: Email
essentials: Informations essentielles
@@ -63,6 +62,7 @@ fr:
roles: Rôles
slug: Slug
socials: Réseaux sociaux
+ summary: Résumé
teacher: Enseignant·e
tenure: Titulaire ?
twitter: Twitter (nom d'utilisateur)
@@ -81,24 +81,24 @@ fr:
person: Personne
target_id: ''
university/organization:
- name: Nom
- long_name: Nom complet
- description: Meta description
- description_short: Chapô
- text: Texte
- contact: Informations de contact
- legal: Informations légales
address: Adresse
- zipcode: Code postal
city: Ville
+ contact: Informations de contact
country: Pays
- url: Site Web
- phone: Téléphone
+ description: Meta description
email: Email
+ kind: Type
+ legal: Informations légales
logo: Logo sur fond clair (par défaut)
logo_on_dark_background: Logo sur fond sombre (optionnel)
- kind: Type
+ long_name: Nom complet
+ name: Nom
+ phone: Téléphone
siren: Numéro de SIREN
+ summary: Chapô
+ text: Texte
+ url: Site Web
+ zipcode: Code postal
university/role:
description: Description
people: Personnes
diff --git a/db/migrate/20230109110701_rename_description_short_to_summary.rb b/db/migrate/20230109110701_rename_description_short_to_summary.rb
new file mode 100644
index 000000000..604646f1a
--- /dev/null
+++ b/db/migrate/20230109110701_rename_description_short_to_summary.rb
@@ -0,0 +1,10 @@
+class RenameDescriptionShortToSummary < ActiveRecord::Migration[7.0]
+ def change
+ rename_column :communication_website_pages, :description_short, :summary
+ rename_column :communication_website_posts, :description_short, :summary
+ rename_column :education_diplomas, :description_short, :summary
+ rename_column :education_programs, :description_short, :summary
+ rename_column :university_organizations, :description_short, :summary
+ rename_column :university_people, :description_short, :summary
+ end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 0afdf7c29..8573f604d 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,7 +10,7 @@
#
# It's strongly recommended that you check this file into your version control system.
-ActiveRecord::Schema[7.0].define(version: 2023_01_06_132654) do
+ActiveRecord::Schema[7.0].define(version: 2023_01_09_110701) do
# These are extensions that must be enabled in order to support this database
enable_extension "pgcrypto"
enable_extension "plpgsql"
@@ -314,7 +314,7 @@ ActiveRecord::Schema[7.0].define(version: 2023_01_06_132654) do
t.text "github_path"
t.string "featured_image_alt"
t.text "text"
- t.text "description_short"
+ t.text "summary"
t.string "breadcrumb_title"
t.text "header_text"
t.integer "kind"
@@ -358,7 +358,7 @@ ActiveRecord::Schema[7.0].define(version: 2023_01_06_132654) do
t.boolean "pinned", default: false
t.string "featured_image_alt"
t.text "text"
- t.text "description_short"
+ t.text "summary"
t.uuid "language_id"
t.text "featured_image_credit"
t.index ["author_id"], name: "index_communication_website_posts_on_author_id"
@@ -465,7 +465,7 @@ ActiveRecord::Schema[7.0].define(version: 2023_01_06_132654) do
t.datetime "updated_at", null: false
t.integer "ects"
t.text "duration"
- t.text "description_short"
+ t.text "summary"
t.index ["university_id"], name: "index_education_diplomas_on_university_id"
end
@@ -503,7 +503,7 @@ ActiveRecord::Schema[7.0].define(version: 2023_01_06_132654) do
t.boolean "initial"
t.boolean "apprenticeship"
t.string "registration_url"
- t.text "description_short"
+ t.text "summary"
t.index ["diploma_id"], name: "index_education_programs_on_diploma_id"
t.index ["parent_id"], name: "index_education_programs_on_parent_id"
t.index ["university_id"], name: "index_education_programs_on_university_id"
@@ -714,7 +714,7 @@ ActiveRecord::Schema[7.0].define(version: 2023_01_06_132654) do
t.string "slug"
t.text "text"
t.string "nic"
- t.text "description_short"
+ t.text "summary"
t.index ["university_id"], name: "index_university_organizations_on_university_id"
end
@@ -739,7 +739,7 @@ ActiveRecord::Schema[7.0].define(version: 2023_01_06_132654) do
t.string "twitter"
t.string "linkedin"
t.boolean "is_alumnus", default: false
- t.text "description_short"
+ t.text "summary"
t.boolean "is_author"
t.string "name"
t.integer "gender"
diff --git a/test/fixtures/communication/website/posts.yml b/test/fixtures/communication/website/posts.yml
index 40e32e5fd..b22a21920 100644
--- a/test/fixtures/communication/website/posts.yml
+++ b/test/fixtures/communication/website/posts.yml
@@ -4,7 +4,6 @@
#
# id :uuid not null, primary key
# description :text
-# description_short :text
# featured_image_alt :string
# featured_image_credit :text
# github_path :text
@@ -12,6 +11,7 @@
# published :boolean default(FALSE)
# published_at :datetime
# slug :text
+# summary :text
# text :text
# title :string
# created_at :datetime not null
diff --git a/test/fixtures/education/diplomas.yml b/test/fixtures/education/diplomas.yml
index 7116f2153..03ebcb6c3 100644
--- a/test/fixtures/education/diplomas.yml
+++ b/test/fixtures/education/diplomas.yml
@@ -2,17 +2,17 @@
#
# Table name: education_diplomas
#
-# id :uuid not null, primary key
-# description_short :text
-# duration :text
-# ects :integer
-# level :integer default("not_applicable")
-# name :string
-# short_name :string
-# slug :string
-# created_at :datetime not null
-# updated_at :datetime not null
-# university_id :uuid not null, indexed
+# id :uuid not null, primary key
+# duration :text
+# ects :integer
+# level :integer default("not_applicable")
+# name :string
+# short_name :string
+# slug :string
+# summary :text
+# created_at :datetime not null
+# updated_at :datetime not null
+# university_id :uuid not null, indexed
#
# Indexes
#
diff --git a/test/fixtures/university/organizations.yml b/test/fixtures/university/organizations.yml
index 664399044..351f7219f 100644
--- a/test/fixtures/university/organizations.yml
+++ b/test/fixtures/university/organizations.yml
@@ -2,27 +2,27 @@
#
# Table name: university_organizations
#
-# id :uuid not null, primary key
-# active :boolean default(TRUE)
-# address :string
-# city :string
-# country :string
-# description :text
-# description_short :text
-# email :string
-# kind :integer default("company")
-# long_name :string
-# name :string
-# nic :string
-# phone :string
-# siren :string
-# slug :string
-# text :text
-# url :string
-# zipcode :string
-# created_at :datetime not null
-# updated_at :datetime not null
-# university_id :uuid not null, indexed
+# id :uuid not null, primary key
+# active :boolean default(TRUE)
+# address :string
+# city :string
+# country :string
+# description :text
+# email :string
+# kind :integer default("company")
+# long_name :string
+# name :string
+# nic :string
+# phone :string
+# siren :string
+# slug :string
+# summary :text
+# text :text
+# url :string
+# zipcode :string
+# created_at :datetime not null
+# updated_at :datetime not null
+# university_id :uuid not null, indexed
#
# Indexes
#
diff --git a/test/models/education/diploma_test.rb b/test/models/education/diploma_test.rb
index 3e7e16a4d..31cecbf3b 100644
--- a/test/models/education/diploma_test.rb
+++ b/test/models/education/diploma_test.rb
@@ -2,17 +2,17 @@
#
# Table name: education_diplomas
#
-# id :uuid not null, primary key
-# description_short :text
-# duration :text
-# ects :integer
-# level :integer default("not_applicable")
-# name :string
-# short_name :string
-# slug :string
-# created_at :datetime not null
-# updated_at :datetime not null
-# university_id :uuid not null, indexed
+# id :uuid not null, primary key
+# duration :text
+# ects :integer
+# level :integer default("not_applicable")
+# name :string
+# short_name :string
+# slug :string
+# summary :text
+# created_at :datetime not null
+# updated_at :datetime not null
+# university_id :uuid not null, indexed
#
# Indexes
#
diff --git a/test/models/university/organization_test.rb b/test/models/university/organization_test.rb
index bb3781c18..04e6d40e7 100644
--- a/test/models/university/organization_test.rb
+++ b/test/models/university/organization_test.rb
@@ -2,27 +2,27 @@
#
# Table name: university_organizations
#
-# id :uuid not null, primary key
-# active :boolean default(TRUE)
-# address :string
-# city :string
-# country :string
-# description :text
-# description_short :text
-# email :string
-# kind :integer default("company")
-# long_name :string
-# name :string
-# nic :string
-# phone :string
-# siren :string
-# slug :string
-# text :text
-# url :string
-# zipcode :string
-# created_at :datetime not null
-# updated_at :datetime not null
-# university_id :uuid not null, indexed
+# id :uuid not null, primary key
+# active :boolean default(TRUE)
+# address :string
+# city :string
+# country :string
+# description :text
+# email :string
+# kind :integer default("company")
+# long_name :string
+# name :string
+# nic :string
+# phone :string
+# siren :string
+# slug :string
+# summary :text
+# text :text
+# url :string
+# zipcode :string
+# created_at :datetime not null
+# updated_at :datetime not null
+# university_id :uuid not null, indexed
#
# Indexes
#
--
GitLab