Bloc titre - nettoyage

app/controllers/admin/communication/blocks_controller.rb

@@ -124,21 +124,8 @@ def redirect_if_block_language_is_incorrect
 
   def reorder_object
     @id = @object[:id]
-    @object[:kind] == 'heading' ? reorder_heading
-                                : reorder_block
-  end
-
-  def reorder_heading
-    @heading = current_university.communication_block_headings.find(@id)
-    @heading.update_columns position: @index_heading
-    @index_block = 0
-    @index_heading += 1
-  end
-
-  def reorder_block
     @block = current_university.communication_blocks.find(@id)
-    @block.update_columns position: @index_block,
-                          heading_id: @heading&.id
+    @block.update_columns position: @index_block
     @index_block += 1
   end
 

app/models/communication/block.rb

@@ -15,21 +15,18 @@
 #  updated_at               :datetime         not null
 #  about_id                 :uuid             indexed => [about_type]
 #  communication_website_id :uuid             indexed
-#  heading_id               :uuid             indexed
 #  university_id            :uuid             not null, indexed
 #
 # Indexes
 #
 #  index_communication_blocks_on_communication_website_id  (communication_website_id)
-#  index_communication_blocks_on_heading_id                (heading_id)
 #  index_communication_blocks_on_university_id             (university_id)
 #  index_communication_website_blocks_on_about             (about_type,about_id)
 #
 # Foreign Keys
 #
 #  fk_rails_18291ef65f  (university_id => universities.id)
 #  fk_rails_80e5625874  (communication_website_id => communication_websites.id)
-#  fk_rails_90ac986fab  (heading_id => communication_block_headings.id)
 #
 class Communication::Block < ApplicationRecord
   BLOCK_COPY_COOKIE = 'osuny-content-editor-block-copy'
@@ -166,7 +163,7 @@ def to_s
   protected
 
   def last_ordered_element
-    about.blocks.where(heading_id: heading_id).ordered.last
+    about.blocks.ordered.last
   end
 
   def set_university_and_website_from_about

app/models/communication/block/with_heading_ranks.rb

@@ -1,12 +1,7 @@
 module Communication::Block::WithHeadingRanks
   extend ActiveSupport::Concern
-
-  DEFAULT_HEADING_LEVEL = 2 # h1 is the page title
 
-  included do
-    # TODO TITLE remove
-    belongs_to :heading, optional: true
-  end
+  DEFAULT_HEADING_LEVEL = 2 # h1 is the page title
 
   def heading_rank_self
     title.present? ? heading_rank_base : false

app/models/communication/website/portfolio/project/localization.rb

@@ -10,6 +10,7 @@
 #  published                :boolean          default(FALSE)
 #  published_at             :datetime
 #  slug                     :string
+#  subtitle                 :string
 #  summary                  :text
 #  title                    :string
 #  created_at               :datetime         not null

app/models/concerns/contentful.rb

@@ -4,8 +4,10 @@ module Contentful
   LARGE_NUMBER_OF_BLOCKS = 5
 
   included do
-    has_many :blocks, as: :about, class_name: 'Communication::Block', dependent: :destroy
-    has_many :headings, as: :about, class_name: 'Communication::Block::Heading', dependent: :destroy
+    has_many  :blocks,
+              as: :about,
+              class_name: 'Communication::Block',
+              dependent: :destroy
   end
 
   def contents

app/models/university/with_communication.rb

@@ -28,10 +28,5 @@ module University::WithCommunication
               class_name: 'Communication::Block',
               dependent: :destroy
     alias_method :blocks, :communication_blocks
-
-    has_many  :communication_block_headings,
-              class_name: 'Communication::Block::Heading',
-              dependent: :destroy
-    alias_method :headings, :communication_block_headings
   end
 end

db/migrate/20241009141435_remove_communication_block_headings.rb

@@ -0,0 +1,6 @@
+class RemoveCommunicationBlockHeadings < ActiveRecord::Migration[7.1]
+  def change
+    remove_column :communication_blocks, :heading_id
+    drop_table :communication_block_headings
+  end
+end