diff --git a/apps/app/priv/templates/phx.gen.html/form.html.eex b/apps/app/priv/templates/phx.gen.html/form.html.eex index 66057d91..18afbff6 100644 --- a/apps/app/priv/templates/phx.gen.html/form.html.eex +++ b/apps/app/priv/templates/phx.gen.html/form.html.eex @@ -1,5 +1,5 @@ <%%= form_for @changeset, @action, [class: "ui large form"], fn f -> %> -
+
<%= for input <- Mix.Legendary.inputs(schema) do %> <%= input %> <% end %> diff --git a/apps/core/lib/core_web/views/helpers.ex b/apps/core/lib/core_web/views/helpers.ex index 20d3dcdb..9921792e 100644 --- a/apps/core/lib/core_web/views/helpers.ex +++ b/apps/core/lib/core_web/views/helpers.ex @@ -46,15 +46,9 @@ defmodule CoreWeb.Helpers do """ end - def styled_input(f, field, opts \\ [], options \\ nil) do - styled_input(f, field, opts, options) do - "" - end - end - - def styled_input(f, field, opts, options, do: content) do + def styled_input(f, field, opts \\ [], options \\ nil, block_list \\ []) do + {content, _} = Keyword.pop(block_list, :do, "") {type, rest_opts} = Keyword.pop(opts, :type, input_type(f, field)) - IO.inspect(type) {icon, rest_opts} = Keyword.pop(rest_opts, :icon, "") {classes, rest_opts} = Keyword.pop(rest_opts, :class, default_classes_for_type(type)) {label_text, rest_opts} = Keyword.pop(rest_opts, :label) diff --git a/apps/core/test/core_web/views/helpers_test.exs b/apps/core/test/core_web/views/helpers_test.exs index e6d75818..30ec8907 100644 --- a/apps/core/test/core_web/views/helpers_test.exs +++ b/apps/core/test/core_web/views/helpers_test.exs @@ -74,13 +74,12 @@ defmodule CoreWeb.HelpersTest do |> flash_block() |> safe_to_string() - assert markup =~ "ui negative message" + assert markup =~ "js-flash" end test "styled_input/4 (without error)" do markup = safe_to_string(styled_input(form(), :no_error_field)) - assert markup =~ ~S{
safe_to_string() - assert markup =~ ~S{