From 503e5b76f57b5438931bacf4455110c05ad94ea6 Mon Sep 17 00:00:00 2001
From: pabois <pierreandre.boissinot@noesya.coop>
Date: Mon, 29 Jan 2024 11:39:15 +0100
Subject: [PATCH] remove for orgas
---
.../admin/university/organizations_controller.rb | 3 ++-
app/models/university/organization.rb | 1 -
app/views/admin/university/organizations/_form.html.erb | 9 ---------
app/views/admin/university/organizations/show.html.erb | 5 -----
config/locales/university/en.yml | 1 -
config/locales/university/fr.yml | 1 -
...0647_add_photo_credits_to_organizations_and_people.rb | 6 ------
db/migrate/20240129100647_add_photo_credits_to_people.rb | 5 +++++
db/schema.rb | 1 -
9 files changed, 7 insertions(+), 25 deletions(-)
delete mode 100644 db/migrate/20240129100647_add_photo_credits_to_organizations_and_people.rb
create mode 100644 db/migrate/20240129100647_add_photo_credits_to_people.rb
diff --git a/app/controllers/admin/university/organizations_controller.rb b/app/controllers/admin/university/organizations_controller.rb
index c465ca66c..8a29413c8 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 367bf092e..3d2ed7019 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 517bcfb1a..290735503 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 8bc99d289..0b70bb3bc 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 d5f620d44..eb9bb65e3 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 c3ff930c0..b070cac54 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 ddbd10da7..000000000
--- 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 000000000..72fd5f44f
--- /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 21089f2d7..f6ea6ac59 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"
--
GitLab