Do not override changeset action

phoenixframework · Nov 17, 2024 · bb3504e · bb3504e
1 parent 0841557
commit bb3504e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 7 deletions.
diff --git a/lib/phoenix_ecto/html.ex b/lib/phoenix_ecto/html.ex
@@ -1,10 +1,8 @@
 if Code.ensure_loaded?(Phoenix.HTML) do
   defimpl Phoenix.HTML.FormData, for: Ecto.Changeset do
     def to_form(changeset, opts) do
-      {action, opts} = Keyword.pop_lazy(opts, :action, fn -> changeset.action end)
-      changeset = Map.put(changeset, :action, action)
-
-      %{params: params, data: data} = changeset
+      %{params: params, data: data, action: action} = changeset
+      {action, opts} = Keyword.pop(opts, :action, action)
       {name, opts} = Keyword.pop(opts, :as)
 
       name = to_string(name || form_for_name(data))

diff --git a/test/phoenix_ecto/html_test.exs b/test/phoenix_ecto/html_test.exs
@@ -42,17 +42,16 @@ defmodule PhoenixEcto.HTMLTest do
       assert f.source.action == nil
     end
 
-    test "to_form :action option sets changeset action" do
+    test "to_form :action option sets form action" do
       changeset =
         %User{}
         |> cast(%{}, ~w()a)
         |> validate_length(:name, min: 3)
-        |> Map.put(:action, :validate)
+        |> Map.replace!(:action, :validate)
 
       assert changeset.action == :validate
       f = to_form(changeset, action: :insert)
       assert f.action == :insert
-      assert f.source.action == :insert
     end
 
     test "to_form without :action option uses changeset action" do