Skip to content

Commit 6ce90e0

Browse files
Add searchable attributes to element and ingredient definition
Use the same attribute as in page definition for element and ingredient definition. This will ease the upgrade of alchemy-pg_search to Alchemy 8.0. Ref: AlchemyCMS/alchemy-pg_search#69 (cherry picked from commit 152a003)
1 parent 90442d5 commit 6ce90e0

5 files changed

Lines changed: 5 additions & 0 deletions

File tree

app/models/alchemy/element.rb

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ class Element < BaseRecord
4141
"ingredients",
4242
"message",
4343
"nestable_elements",
44+
"searchable",
4445
"taggable",
4546
"warning"
4647
].freeze

app/models/alchemy/element_definition.rb

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ class ElementDefinition
2222
attribute :warning
2323
attribute :hint
2424
attribute :icon
25+
attribute :searchable, :boolean, default: true
2526

2627
validates :name,
2728
presence: true,

app/models/alchemy/ingredient_definition.rb

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ class IngredientDefinition
1717
attribute :default
1818
attribute :deprecated
1919
attribute :hint
20+
attribute :searchable, :boolean, default: true
2021

2122
validates :role,
2223
presence: true,

spec/models/alchemy/element_definition_spec.rb

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ module Alchemy
3232
it { is_expected.to have_key(:message) }
3333
it { is_expected.to have_key(:warning) }
3434
it { is_expected.to have_key(:hint) }
35+
it { is_expected.to have_key(:searchable) }
3536
end
3637

3738
describe "validations" do

spec/models/alchemy/ingredient_definition_spec.rb

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ module Alchemy
2727
it { is_expected.to have_key(:default) }
2828
it { is_expected.to have_key(:deprecated) }
2929
it { is_expected.to have_key(:hint) }
30+
it { is_expected.to have_key(:searchable) }
3031
end
3132

3233
describe "validations" do

0 commit comments

Comments
 (0)