Skip to content
Snippets Groups Projects
Unverified Commit ede2e0a9 authored by Pierre-André Boissinot's avatar Pierre-André Boissinot Committed by GitHub
Browse files

Merge pull request #707 from noesya/fix/description-short-to-summary 

Fix/description short to summary
parents 2e0784fb 867c3c81
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 22 additions and 22 deletions
app/controllers/admin/communication/websites/categories_controller.rb
+ 1
− 1
View file @ ede2e0a9
......@@ -97,7 +97,7 @@ class Admin::Communication::Websites::CategoriesController < Admin::Communicatio
def category_params
params.require(:communication_website_category)
.permit(
:website_id, :name, :description, :text, :slug, :parent_id,
:website_id, :name, :description, :summary, :slug, :parent_id,
:featured_image, :featured_image_delete, :featured_image_infos, :featured_image_alt, :featured_image_credit
)
.merge(university_id: current_university.id)
......
app/controllers/admin/communication/websites/pages_controller.rb
+ 1
− 1
View file @ ede2e0a9
......@@ -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
)
......
app/controllers/admin/communication/websites/posts_controller.rb
+ 1
− 1
View file @ ede2e0a9
......@@ -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: []
......
app/controllers/admin/education/diplomas_controller.rb
+ 1
− 1
View file @ ede2e0a9
......@@ -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
app/controllers/admin/education/programs_controller.rb
+ 1
− 1
View file @ ede2e0a9
......@@ -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,
......
app/controllers/admin/research/journals/papers_controller.rb
+ 1
− 1
View file @ ede2e0a9
......@@ -60,7 +60,7 @@ class Admin::Research::Journals::PapersController < Admin::Research::Journals::A
def paper_params
params.require(:research_journal_paper)
.permit(:title, :slug, :text, :published, :published_at, :abstract, :description, :pdf, :references, :keywords, :research_journal_volume_id, person_ids: [])
.permit(:title, :slug, :text, :published, :published_at, :summary, :abstract, :description, :pdf, :references, :keywords, :research_journal_volume_id, person_ids: [])
.merge(university_id: current_university.id)
end
end
app/controllers/admin/university/organizations_controller.rb
+ 3
− 3
View file @ ede2e0a9
......@@ -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
app/controllers/admin/university/people_controller.rb
+ 1
− 1
View file @ ede2e0a9
......@@ -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,
......
app/controllers/extranet/personal_data_controller.rb
+ 1
− 1
View file @ ede2e0a9
......@@ -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
......
app/models/communication/website/category.rb
+ 1
− 1
View file @ ede2e0a9
......@@ -12,7 +12,7 @@
# path :string
# position :integer
# slug :string
# text :text
# summary :text
# created_at :datetime not null
# updated_at :datetime not null
# communication_website_id :uuid not null, indexed
......
app/models/communication/website/page.rb
+ 1
− 1
View file @ ede2e0a9
......@@ -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
......
app/models/communication/website/page/accessibility.rb
+ 1
− 1
View file @ ede2e0a9
......@@ -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
......
app/models/communication/website/page/administrator.rb
+ 1
− 1
View file @ ede2e0a9
......@@ -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
......
app/models/communication/website/page/author.rb
+ 1
− 1
View file @ ede2e0a9
......@@ -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
......
app/models/communication/website/page/communication_post.rb
+ 1
− 1
View file @ ede2e0a9
......@@ -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
......
app/models/communication/website/page/education_diploma.rb
+ 1
− 1
View file @ ede2e0a9
......@@ -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
......
app/models/communication/website/page/education_program.rb
+ 1
− 1
View file @ ede2e0a9
......@@ -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
......
app/models/communication/website/page/home.rb
+ 1
− 1
View file @ ede2e0a9
......@@ -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
......
app/models/communication/website/page/legal_term.rb
+ 1
− 1
View file @ ede2e0a9
......@@ -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
......
app/models/communication/website/page/organization.rb
+ 1
− 1
View file @ ede2e0a9
......@@ -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
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment