Merge pull request #25 from dwyl/assigns

displays changeset from assigns correctly
dwyl · Nov 7, 2018 · a01b9a9 · a01b9a9
2 parents 6af4815 + 7741e84
commit a01b9a9
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/lib/autoform.ex b/lib/autoform.ex
@@ -174,11 +174,13 @@ defmodule Autoform do
         Phoenix.View.render(
           Autoform.CustomView,
           "custom.html",
-          %{
+          Keyword.get(options, :assigns, %{})
+          |> Map.new()
+          |> Map.put_new(:changeset, first_schema.changeset(struct(first_schema), %{}))
+          |> Map.merge(%{
             elements: element_assigns,
-            changeset: first_schema.changeset(struct(first_schema), %{}),
             action: Keyword.get(options, :path, path(conn, action, first_schema, options))
-          }
+          })
         )
       end
 

diff --git a/lib/templates/custom/custom.html.eex b/lib/templates/custom/custom.html.eex
@@ -31,7 +31,7 @@
               id="<%=element.schema_name%>_<%=assoc[:name]%>_<%=String.split(Map.get(a, :display)) |> Enum.join |> Macro.underscore()%>"
               name="<%=element.schema_name%>[<%=assoc[:name]%>][<%=String.to_atom(Map.get(a, :display))%>]"
               class="form-control"
-              <%= if Map.get(assoc.loaded_associations, assoc[:name]) |> Enum.find(fn l -> Map.get(l, :name) == Map.get(a, :display) || Map.get(l, :type) == Map.get(a, :display) end) do "checked" end%>
+              <%= if (Map.get(assoc.loaded_associations, assoc[:name]) || []) |> Enum.find(fn l -> Map.get(l, :name) == Map.get(a, :display) || Map.get(l, :type) == Map.get(a, :display) end) do "checked" end%>
               >
             <label for="<%=element.schema_name%>_<%=assoc[:name]%>_<%=String.to_atom(Map.get(a, :display))%>"><%= Map.get(a, :display) |> String.capitalize() %></label>
           <% end %>