diff --git a/docker-compose.yml b/docker-compose.yml index 4c169b5..8621603 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -10,7 +10,11 @@ services: POSTGRES_PASSWORD: postgres POSTGRES_DB: mv_dev volumes: - - postgres-data:/var/lib/postgresql/data + - type: volume + source: postgres-data + target: /var/lib/postgresql/data + volume: + nocopy: true ports: - "5000:5432" networks: @@ -45,7 +49,9 @@ services: - rauthy-dev - local volumes: - - rauthy-data:/app/data + - type: volume + source: rauthy-data + target: /app/data volumes: postgres-data: diff --git a/lib/mv_web/live/custom_field_value_live/form.ex b/lib/mv_web/live/custom_field_value_live/form.ex index 4db2bed..6ff6432 100644 --- a/lib/mv_web/live/custom_field_value_live/form.ex +++ b/lib/mv_web/live/custom_field_value_live/form.ex @@ -52,7 +52,7 @@ defmodule MvWeb.CustomFieldValueLive.Form do options={custom_field_options(@custom_fields)} prompt={gettext("Choose a custom field")} /> - + <.input field={@form[:member_id]} @@ -61,7 +61,7 @@ defmodule MvWeb.CustomFieldValueLive.Form do options={member_options(@members)} prompt={gettext("Choose a member")} /> - + <%= if @selected_custom_field do %> <.union_value_input form={@form} custom_field={@selected_custom_field} /> diff --git a/lib/mv_web/live/user_live/form.ex b/lib/mv_web/live/user_live/form.ex index f0cc1ce..c6749d8 100644 --- a/lib/mv_web/live/user_live/form.ex +++ b/lib/mv_web/live/user_live/form.ex @@ -44,7 +44,7 @@ defmodule MvWeb.UserLive.Form do <.form class="max-w-xl" for={@form} id="user-form" phx-change="validate" phx-submit="save"> <.input field={@form[:email]} label={gettext("Email")} required type="email" /> - +
- +

{gettext("Linked Member")}

diff --git a/lib/mv_web/live/user_live/index.html.heex b/lib/mv_web/live/user_live/index.html.heex index e7fd72e..c496ea8 100644 --- a/lib/mv_web/live/user_live/index.html.heex +++ b/lib/mv_web/live/user_live/index.html.heex @@ -51,7 +51,7 @@ <:col :let={user} label={gettext("Linked Member")}> <%= if user.member do %> - {MvWeb.Helpers.MemberHelpers.display_name(user.member)} + {MvWeb.MemberLive.Index.display_name(user.member)} <% else %> {gettext("No member linked")} <% end %>