diff --git a/app/models/checklist_item.rb b/app/models/checklist_item.rb index 0f3adeab5..aec65004d 100644 --- a/app/models/checklist_item.rb +++ b/app/models/checklist_item.rb @@ -1,4 +1,7 @@ class ChecklistItem < ApplicationRecord + + attr_accessor :with_paragraphs + auto_strip_attributes :text, nullify: false validates :text, presence: true, diff --git a/app/serializers/checklist_item_serializer.rb b/app/serializers/checklist_item_serializer.rb index 7fcd989d0..21f36ac29 100644 --- a/app/serializers/checklist_item_serializer.rb +++ b/app/serializers/checklist_item_serializer.rb @@ -8,6 +8,10 @@ class ChecklistItemSerializer < ActiveModel::Serializer attributes :id, :text, :checked, :position, :urls, :sa_text, :with_paragraphs + def with_paragraphs + object.text.include?("\n") + end + def sa_text @user = scope[:user] || @instance_options[:user] custom_auto_link(object.text, diff --git a/db/migrate/20230921142200_add_with_paragraphs_to_checklist_item.rb b/db/migrate/20230921142200_add_with_paragraphs_to_checklist_item.rb deleted file mode 100644 index 786f7effe..000000000 --- a/db/migrate/20230921142200_add_with_paragraphs_to_checklist_item.rb +++ /dev/null @@ -1,9 +0,0 @@ -# frozen_string_literal: true - -class AddWithParagraphsToChecklistItem < ActiveRecord::Migration[7.0] - def change - add_column :checklist_items, :with_paragraphs, :boolean, default: false - - ChecklistItem.where("text ~ '^.*\\n.*$'").update_all(with_paragraphs: true) - end -end diff --git a/db/schema.rb b/db/schema.rb index c89df20bd..be3be339f 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_09_21_142200) do +ActiveRecord::Schema[7.0].define(version: 2023_09_04_080206) do # These are extensions that must be enabled in order to support this database enable_extension "btree_gist" enable_extension "pg_trgm" @@ -115,7 +115,6 @@ ActiveRecord::Schema[7.0].define(version: 2023_09_21_142200) do t.bigint "created_by_id" t.bigint "last_modified_by_id" t.integer "position" - t.boolean "with_paragraphs", default: false t.index "trim_html_tags((text)::text) gin_trgm_ops", name: "index_checklist_items_on_text", using: :gin t.index ["checklist_id", "position"], name: "index_checklist_items_on_checklist_id_and_position", unique: true t.index ["checklist_id"], name: "index_checklist_items_on_checklist_id"