shibao/cannery
1
2
Fork 1
Code Issues 15 Pull Requests Projects 1 Releases 38 Wiki Activity

fix moving ammo between containers

Browse Source
This commit is contained in:
shibao
2022-11-10 21:45:50 -05:00
parent 0dbd1af553
commit 1c7721887f
24 changed files with 134 additions and 115 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/cannery_web/components/move_ammo_group_component.ex
View File

@ -22,7 +22,7 @@ defmodule CanneryWeb.Components.MoveAmmoGroupComponent do
assigns,
socket
) do
changeset = ammo_group |> AmmoGroup.update_changeset(%{})
changeset = ammo_group |> AmmoGroup.update_changeset(%{}, current_user)
containers =
Containers.list_containers(current_user)

2
lib/cannery_web/live/ammo_group_live/form_component.ex
View File

@ -94,7 +94,7 @@ defmodule CanneryWeb.AmmoGroupLive.FormComponent do
ammo_group |> AmmoGroup.create_changeset(ammo_type, container, user, ammo_group_params)
action == :edit ->
ammo_group |> AmmoGroup.update_changeset(ammo_group_params)
ammo_group |> AmmoGroup.update_changeset(ammo_group_params, user)
end
changeset =

11
lib/cannery_web/live/ammo_group_live/index.ex
View File

@ -9,12 +9,12 @@ defmodule CanneryWeb.AmmoGroupLive.Index do
@impl true
def mount(_params, _session, socket) do
{:ok, socket |> assign(show_used: false) |> display_ammo_groups()}
{:ok, socket |> assign(show_used: false)}
end
@impl true
def handle_params(params, _url, %{assigns: %{live_action: live_action}} = socket) do
{:noreply, apply_action(socket, live_action, params)}
{:noreply, apply_action(socket, live_action, params) |> display_ammo_groups()}
end
defp apply_action(
@ -52,7 +52,9 @@ defmodule CanneryWeb.AmmoGroupLive.Index do
end
defp apply_action(socket, :index, _params) do
socket |> assign(:page_title, gettext("Ammo groups")) |> assign(:ammo_group, nil)
socket
|> assign(:page_title, gettext("Ammo groups"))
|> assign(:ammo_group, nil)
end
@impl true
@ -87,7 +89,8 @@ defmodule CanneryWeb.AmmoGroupLive.Index do
%{assigns: %{current_user: current_user, show_used: show_used}} = socket
) do
ammo_groups =
Ammo.list_ammo_groups(current_user, show_used) |> Repo.preload([:ammo_type, :container])
Ammo.list_ammo_groups(current_user, show_used)
|> Repo.preload([:ammo_type, :container], force: true)
ammo_types_count = Ammo.get_ammo_types_count!(current_user)
containers_count = Containers.get_containers_count!(current_user)