From 6a08040e7fd55b01e29671f27ae879d34788f641 Mon Sep 17 00:00:00 2001 From: Martin Meyerhoff Date: Mon, 18 May 2020 20:55:37 +0200 Subject: [PATCH] Fix deleting an EssenceNode from a content (#1834) We can leverage Rails' functionality here. --- app/models/alchemy/essence_node.rb | 13 ------------- .../alchemy/essences/_essence_node_editor.html.erb | 2 +- 2 files changed, 1 insertion(+), 14 deletions(-) diff --git a/app/models/alchemy/essence_node.rb b/app/models/alchemy/essence_node.rb index 8db0c474c0..162dba46cc 100644 --- a/app/models/alchemy/essence_node.rb +++ b/app/models/alchemy/essence_node.rb @@ -2,8 +2,6 @@ module Alchemy class EssenceNode < BaseRecord - NODE_ID = /\A\d+\z/ - acts_as_essence( ingredient_column: :node, preview_text_column: :node_name, @@ -16,16 +14,5 @@ class EssenceNode < BaseRecord ) delegate :name, to: :node, prefix: true, allow_nil: true - - def ingredient=(node) - case node - when NODE_ID - self.node = Alchemy::Node.new(id: node) - when Alchemy::Node - self.node = node - else - super - end - end end end diff --git a/app/views/alchemy/essences/_essence_node_editor.html.erb b/app/views/alchemy/essences/_essence_node_editor.html.erb index 7e7fc77f8e..13d5112583 100644 --- a/app/views/alchemy/essences/_essence_node_editor.html.erb +++ b/app/views/alchemy/essences/_essence_node_editor.html.erb @@ -4,7 +4,7 @@ data: essence_node_editor.data_attributes do %> <%= content_label(essence_node_editor) %> <%= text_field_tag( - essence_node_editor.form_field_name, + essence_node_editor.form_field_name("node_id"), essence_node_editor.essence.node_id, id: essence_node_editor.form_field_id, class: 'alchemy_selectbox full_width'