diff --git a/app/controllers/admin/university/organizations_controller.rb b/app/controllers/admin/university/organizations_controller.rb index c465ca66c02c5a8b174c05db451ee90594e854de..8a29413c87ce269851a5ff375fe6af4a7d8d34f2 100644 --- a/app/controllers/admin/university/organizations_controller.rb +++ b/app/controllers/admin/university/organizations_controller.rb @@ -110,7 +110,8 @@ class Admin::University::OrganizationsController < Admin::University::Applicatio :name, :long_name, :slug, :meta_description, :summary, :active, :siren, :kind, :address, :address_name, :address_additional, :zipcode, :city, :country, :text, :url, :phone, :email, :linkedin, :twitter, :mastodon, - :logo, :logo_delete, :logo_infos, :logo_on_dark_background, :logo_on_dark_background_delete, :logo_on_dark_background_infos, :logo_credit, + :logo, :logo_delete, :logo_infos, + :logo_on_dark_background, :logo_on_dark_background_delete, :logo_on_dark_background_infos, category_ids: [] ) end diff --git a/app/models/university/organization.rb b/app/models/university/organization.rb index 367bf092ea26939d176166b2ce131030df7fd011..3d2ed70191a43be0f59aede521971f4a02822e9b 100644 --- a/app/models/university/organization.rb +++ b/app/models/university/organization.rb @@ -13,7 +13,6 @@ # kind :integer default("company") # latitude :float # linkedin :string -# logo_credit :text # long_name :string # longitude :float # mastodon :string diff --git a/app/views/admin/university/organizations/_form.html.erb b/app/views/admin/university/organizations/_form.html.erb index 517bcfb1a6a13f1b9f7a2443080cd278e22b8e33..290735503f79b9fe5e6b31a12c2585a8d2ae4a1a 100644 --- a/app/views/admin/university/organizations/_form.html.erb +++ b/app/views/admin/university/organizations/_form.html.erb @@ -101,15 +101,6 @@ preview: 200, resize: false, direct_upload: true %> - <%= f.input :logo_credit, - as: :summernote, - hint: t('featured_image.credit.hint'), - input_html: { - data: { - translatable: true, - 'summernote-config' => 'link' - } - } %> <% end %> <%= render 'admin/application/meta_description/form', f: f, about: organization %> </div> diff --git a/app/views/admin/university/organizations/show.html.erb b/app/views/admin/university/organizations/show.html.erb index 8bc99d289aece377c31018ef27a71ecb1d0d2301..0b70bb3bc23fec153c26ef9dc52e1f16555bdd96 100644 --- a/app/views/admin/university/organizations/show.html.erb +++ b/app/views/admin/university/organizations/show.html.erb @@ -135,11 +135,6 @@ <%= kamifusen_tag @organization.logo_on_dark_background, class: 'img-fluid img-fill bg-dark img-thumbnail p-5' %> </div> <% end %> - <% if @organization.logo_credit.present? %> - <div class="small mb-0"> - <%= sanitize @organization.logo_credit %> - </div> - <% end %> <% end if @organization.logo.attached? || @organization.logo_on_dark_background.attached? %> <%= render 'admin/application/meta_description/show', about: @organization %> diff --git a/config/locales/university/en.yml b/config/locales/university/en.yml index d5f620d44216c2d74b4102939d23224e3c478a4e..eb9bb65e3164d34a019aa3f5513ffdbc6dbbb370 100644 --- a/config/locales/university/en.yml +++ b/config/locales/university/en.yml @@ -41,7 +41,6 @@ en: legal: Legal information linkedin: LinkedIn logo: Logo for light backgrounds (default) - logo_credit: Credit logo_on_dark_background: Logo for dark backgrounds (optional) long_name: Long name map: Map diff --git a/config/locales/university/fr.yml b/config/locales/university/fr.yml index c3ff930c0d94545c0c0f5415c93f22e8fbfc1fab..b070cac54414cbd8e085e85330315a0f500090be 100644 --- a/config/locales/university/fr.yml +++ b/config/locales/university/fr.yml @@ -41,7 +41,6 @@ fr: legal: Informations légales linkedin: LinkedIn logo: Logo sur fond clair (par défaut) - logo_credit: Crédit logo_on_dark_background: Logo sur fond sombre (optionnel) long_name: Nom complet map: Carte diff --git a/db/migrate/20240129100647_add_photo_credits_to_organizations_and_people.rb b/db/migrate/20240129100647_add_photo_credits_to_organizations_and_people.rb deleted file mode 100644 index ddbd10da7dcaf0be4b6dd2d2f17e69d8f5fadb6a..0000000000000000000000000000000000000000 --- a/db/migrate/20240129100647_add_photo_credits_to_organizations_and_people.rb +++ /dev/null @@ -1,6 +0,0 @@ -class AddPhotoCreditsToOrganizationsAndPeople < ActiveRecord::Migration[7.1] - def change - add_column :university_people, :picture_credit, :text - add_column :university_organizations, :logo_credit, :text - end -end diff --git a/db/migrate/20240129100647_add_photo_credits_to_people.rb b/db/migrate/20240129100647_add_photo_credits_to_people.rb new file mode 100644 index 0000000000000000000000000000000000000000..72fd5f44f36fe18ab102dcc480bac7d698df35d5 --- /dev/null +++ b/db/migrate/20240129100647_add_photo_credits_to_people.rb @@ -0,0 +1,5 @@ +class AddPhotoCreditsToPeople < ActiveRecord::Migration[7.1] + def change + add_column :university_people, :picture_credit, :text + end +end diff --git a/db/schema.rb b/db/schema.rb index 21089f2d72a20a96656cd534958202a2730a80f9..f6ea6ac594ca9c363ac720e1b2d557a3cbb08df0 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -967,7 +967,6 @@ ActiveRecord::Schema[7.1].define(version: 2024_01_29_100647) do t.string "address_additional" t.uuid "language_id" t.uuid "original_id" - t.text "logo_credit" t.index ["language_id"], name: "index_university_organizations_on_language_id" t.index ["original_id"], name: "index_university_organizations_on_original_id" t.index ["slug"], name: "index_university_organizations_on_slug"