Skip to content

[#190][BUG] embedded_schema @primary_key false not supported #200

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 9 commits into
base: master
Choose a base branch
from
Open

[#190][BUG] embedded_schema @primary_key false not supported #200

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
8127d01
Fix: error embedded_schema on resource form (update/create)
marinho10 Feb 19, 2021
727ff51
Merge pull request #1 from coletiv/fix/error_embedded_in_form
marinho10 Feb 19, 2021
db06fc4
Add inspect
marinho10 Feb 19, 2021
6f9ad36
Remove IEx
marinho10 Feb 19, 2021
370dbe0
Remove reorder_fields feature
marinho10 Feb 19, 2021
688e0fb
Add reorder_fields but remove id if exists
marinho10 Feb 19, 2021
8c64baf
Merge pull request #2 from coletiv/fix/error_embedded_in_form
marinho10 Feb 19, 2021
0e2a969
Merge branch 'master' of github.com:aesmail/kaffy
marinho10 Jan 4, 2022
4129c41
Add crud_actions to configuration
marinho10 Jan 5, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 6 additions & 9 deletions lib/kaffy/resource_form.ex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ defmodule Kaffy.ResourceForm do
end

permission =
case is_nil(changeset.data.id) do
case is_nil(Map.get(changeset.data, :id)) do
true -> Map.get(options, :create, :editable)
false -> Map.get(options, :update, :editable)
end
Expand All @@ -73,11 +73,6 @@ defmodule Kaffy.ResourceForm do
end
end

def form_field(changeset, form, {field, options}, opts) do
type = Kaffy.ResourceSchema.field_type(changeset.data.__struct__, field)
build_html_input(changeset.data, form, {field, options}, type, opts)
end

defp build_html_input(schema, form, {field, options}, type, opts, readonly \\ false) do
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@aesmail can you double check this chunk of code to see if it affects any logic?

data = schema
{conn, opts} = Keyword.pop(opts, :conn)
Expand All @@ -93,12 +88,14 @@ defmodule Kaffy.ResourceForm do
inputs_for(form, field, fn fp ->
[
{:safe, ~s(<div class="card ml-3" style="padding:15px;">)},
Enum.reduce(embed_fields, [], fn f, all ->
Enum.reduce(embed_fields, [], fn {embed_f, embed_f_options}, all ->
content_tag :div, class: "form-group" do
[
[
form_label(fp, f),
form_field(embed_changeset, fp, {f, options}, class: "form-control")
form_label(fp, embed_f),
form_field(embed_changeset, fp, {embed_f, embed_f_options},
class: "form-control"
)
]
| all
]
Expand Down
3 changes: 2 additions & 1 deletion lib/kaffy/resource_schema.ex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ defmodule Kaffy.ResourceSchema do
end

defp reorder_fields(fields_list, schema) do
[_id, first_field | _fields] = schema.__schema__(:fields)
[first_field | _fields] = schema.__schema__(:fields) -- [:id]

# this is a "nice" feature to re-order the default fields to put the specified fields at the top/bottom of the form
fields_list
Expand Down Expand Up @@ -296,6 +296,7 @@ defmodule Kaffy.ResourceSchema do

def field_type(_schema, {_, type}), do: type
def field_type(schema, field), do: schema.__changeset__() |> Map.get(field, :string)

# def field_type(schema, field), do: schema.__schema__(:type, field)

def get_map_fields(schema) do
Expand Down