Compare commits

..

3 commits

3 changed files with 13 additions and 4 deletions

View file

@ -39,7 +39,10 @@ defmodule MvWeb.MemberLive.Show do
<:item title={gettext("Postal Code")}>{@member.postal_code}</:item> <:item title={gettext("Postal Code")}>{@member.postal_code}</:item>
<:item title={gettext("Linked User")}> <:item title={gettext("Linked User")}>
<%= if @member.user do %> <%= if @member.user do %>
<.link navigate={~p"/users/#{@member.user}"} class="text-blue-600 hover:text-blue-800 underline"> <.link
navigate={~p"/users/#{@member.user}"}
class="text-blue-600 hover:text-blue-800 underline"
>
<.icon name="hero-user" class="h-4 w-4 inline mr-1" /> <.icon name="hero-user" class="h-4 w-4 inline mr-1" />
{@member.user.email} {@member.user.email}
</.link> </.link>

View file

@ -28,7 +28,10 @@ defmodule MvWeb.UserLive.Show do
</:item> </:item>
<:item title={gettext("Linked Member")}> <:item title={gettext("Linked Member")}>
<%= if @user.member do %> <%= if @user.member do %>
<.link navigate={~p"/members/#{@user.member}"} class="text-blue-600 hover:text-blue-800 underline"> <.link
navigate={~p"/members/#{@user.member}"}
class="text-blue-600 hover:text-blue-800 underline"
>
<.icon name="hero-users" class="h-4 w-4 inline mr-1" /> <.icon name="hero-users" class="h-4 w-4 inline mr-1" />
{@user.member.first_name} {@user.member.last_name} {@user.member.first_name} {@user.member.last_name}
</.link> </.link>
@ -44,7 +47,7 @@ defmodule MvWeb.UserLive.Show do
@impl true @impl true
def mount(%{"id" => id}, _session, socket) do def mount(%{"id" => id}, _session, socket) do
user = Ash.get!(Mv.Accounts.User, id, domain: Mv.Accounts, load: [:member]) user = Ash.get!(Mv.Accounts.User, id, domain: Mv.Accounts, load: [:member])
{:ok, {:ok,
socket socket
|> assign(:page_title, gettext("Show User")) |> assign(:page_title, gettext("Show User"))

View file

@ -161,7 +161,10 @@ Enum.each(linked_members, fn member_attrs ->
) )
else else
# User already has a member, just create the member without linking - use upsert to prevent duplicates # User already has a member, just create the member without linking - use upsert to prevent duplicates
Membership.create_member!(member_attrs_without_user, upsert?: true, upsert_identity: :unique_email) Membership.create_member!(member_attrs_without_user,
upsert?: true,
upsert_identity: :unique_email
)
end end
end) end)