Merge pull request #171 from phoenixframework/cm-form-action

Use to_form :action as changeset action when passed

lib/phoenix_ecto/html.ex

@@ -1,6 +1,9 @@
 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
       {name, opts} = Keyword.pop(opts, :as)
 
@@ -11,16 +14,17 @@ if Code.ensure_loaded?(Phoenix.HTML) do
         source: changeset,
         impl: __MODULE__,
         id: id,
+        action: action,
         name: name,
-        errors: form_for_errors(changeset),
+        errors: form_for_errors(changeset, action),
         data: data,
         params: params || %{},
         hidden: form_for_hidden(data),
         options: Keyword.put_new(opts, :method, form_for_method(data))
       }
     end
 
-    def to_form(%{action: parent_action} = source, form, field, opts) do
+    def to_form(source, %{action: parent_action} = form, field, opts) do
       if Keyword.has_key?(opts, :default) do
         raise ArgumentError,
               ":default is not supported on inputs_for with changesets. " <>
@@ -58,7 +62,7 @@ if Code.ensure_loaded?(Phoenix.HTML) do
               impl: __MODULE__,
               id: id,
               name: name,
-              errors: form_for_errors(changeset),
+              errors: form_for_errors(changeset, parent_action),
               data: data,
               params: params || %{},
               hidden: form_for_hidden(data),
@@ -92,7 +96,7 @@ if Code.ensure_loaded?(Phoenix.HTML) do
               id: id <> "_" <> index_string,
               name: name <> "[" <> index_string <> "]",
               index: index,
-              errors: form_for_errors(changeset),
+              errors: form_for_errors(changeset, parent_action),
               data: data,
               params: params || %{},
               hidden: form_for_hidden(data),
@@ -302,9 +306,9 @@ if Code.ensure_loaded?(Phoenix.HTML) do
       raise ArgumentError, "expected #{what} to be a map/struct, got: #{inspect(value)}"
     end
 
-    defp form_for_errors(%{action: nil}), do: []
-    defp form_for_errors(%{action: :ignore}), do: []
-    defp form_for_errors(%{errors: errors}), do: errors
+    defp form_for_errors(_changeset, nil = _action), do: []
+    defp form_for_errors(_changeset, :ignore = _action), do: []
+    defp form_for_errors(%Ecto.Changeset{errors: errors}, _action), do: errors
 
     defp form_for_hidden(%{__struct__: module} = data) do
       module.__schema__(:primary_key)

mix.exs

@@ -51,7 +51,7 @@ defmodule PhoenixEcto.Mixfile do
 
   defp deps do
     [
-      {:phoenix_html, "~> 2.14.2 or ~> 3.0 or ~> 4.0", optional: true},
+      {:phoenix_html, "~> 2.14.2 or ~> 3.0 or ~> 4.1", optional: true},
       {:ecto, "~> 3.5"},
       {:plug, "~> 1.9"},
       {:ex_doc, ">= 0.0.0", only: :docs}