<%= if @user && @user.email && @available_members != [] && Enum.all?(@available_members, &(&1.email == to_string(@user.email))) do %>
-
+
{gettext("Note")}: {gettext(
"A member with this email already exists. To link with a different member, please change one of the email addresses first."
@@ -231,12 +231,12 @@ defmodule MvWeb.UserLive.Form do
<%= if @selected_member_id && @selected_member_name do %>
{gettext("Selected")}: {@selected_member_name}
-
+
{gettext("Save to confirm linking.")}
@@ -245,10 +245,12 @@ defmodule MvWeb.UserLive.Form do
<% end %>
- <.button phx-disable-with={gettext("Saving...")} variant="primary">
- {gettext("Save User")}
-
- <.button navigate={return_path(@return_to, @user)}>{gettext("Cancel")}
+
+ <.button phx-disable-with={gettext("Saving...")} variant="primary">
+ {gettext("Save User")}
+
+ <.button navigate={return_path(@return_to, @user)}>{gettext("Cancel")}
+
"""
diff --git a/lib/mv_web/live/user_live/index.html.heex b/lib/mv_web/live/user_live/index.html.heex
index 3582046..9a98159 100644
--- a/lib/mv_web/live/user_live/index.html.heex
+++ b/lib/mv_web/live/user_live/index.html.heex
@@ -49,7 +49,6 @@
>
{user.email}
- <:col :let={user} label={gettext("OIDC ID")}>{user.oidc_id}
<:col :let={user} label={gettext("Linked Member")}>
<%= if user.member do %>
{user.member.first_name} {user.member.last_name}
diff --git a/lib/mv_web/live/user_live/show.ex b/lib/mv_web/live/user_live/show.ex
index 664f99f..777def1 100644
--- a/lib/mv_web/live/user_live/show.ex
+++ b/lib/mv_web/live/user_live/show.ex
@@ -46,9 +46,7 @@ defmodule MvWeb.UserLive.Show do
<.list>
- <:item title={gettext("ID")}>{@user.id}
<:item title={gettext("Email")}>{@user.email}
- <:item title={gettext("OIDC ID")}>{@user.oidc_id || gettext("Not set")}
<:item title={gettext("Password Authentication")}>
{if @user.hashed_password, do: gettext("Enabled"), else: gettext("Not enabled")}
@@ -56,13 +54,13 @@ defmodule MvWeb.UserLive.Show do
<%= if @user.member do %>
<.link
navigate={~p"/members/#{@user.member}"}
- class="text-blue-600 hover:text-blue-800 underline"
+ class="text-blue-600 underline hover:text-blue-800"
>
- <.icon name="hero-users" class="h-4 w-4 inline mr-1" />
+ <.icon name="hero-users" class="inline w-4 h-4 mr-1" />
{@user.member.first_name} {@user.member.last_name}
<% else %>
-
{gettext("No member linked")}
+
{gettext("No member linked")}
<% end %>
diff --git a/priv/gettext/de/LC_MESSAGES/default.po b/priv/gettext/de/LC_MESSAGES/default.po
index a1bf071..f9d2dcd 100644
--- a/priv/gettext/de/LC_MESSAGES/default.po
+++ b/priv/gettext/de/LC_MESSAGES/default.po
@@ -45,7 +45,7 @@ msgstr "Löschen"
#: lib/mv_web/live/user_live/index.html.heex:66
#, elixir-autogen, elixir-format
msgid "Edit"
-msgstr "Bearbeite"
+msgstr "Bearbeiten"
#: lib/mv_web/live/member_live/show.ex:41
#: lib/mv_web/live/member_live/show.ex:117
diff --git a/test/mv_web/live/profile_navigation_test.exs b/test/mv_web/live/profile_navigation_test.exs
index 3222825..5ba5eb0 100644
--- a/test/mv_web/live/profile_navigation_test.exs
+++ b/test/mv_web/live/profile_navigation_test.exs
@@ -90,8 +90,6 @@ defmodule MvWeb.ProfileNavigationTest do
# Verify we're on the correct profile page with OIDC specific information
{:ok, _profile_view, html} = live(conn, "/users/#{user.id}")
assert html =~ to_string(user.email)
- # OIDC ID should be visible
- assert html =~ "oidc_123"
# Password auth should be disabled for OIDC users
assert html =~ "Not enabled"
end
diff --git a/test/mv_web/member_live/index_custom_fields_display_test.exs b/test/mv_web/member_live/index_custom_fields_display_test.exs
index 0485f5e..802cc8f 100644
--- a/test/mv_web/member_live/index_custom_fields_display_test.exs
+++ b/test/mv_web/member_live/index_custom_fields_display_test.exs
@@ -231,8 +231,8 @@ defmodule MvWeb.MemberLive.IndexCustomFieldsDisplayTest do
conn = conn_with_oidc_user(conn)
{:ok, _view, html} = live(conn, "/members")
- # Date should be displayed in readable format
- assert html =~ "1990" or html =~ "1990-05-15" or html =~ "15.05.1990"
+ # Date should be displayed in European format (dd.mm.yyyy)
+ assert html =~ "15.05.1990"
end
test "formats email custom field values correctly", %{conn: conn, member1: _member1} do
diff --git a/test/mv_web/user_live/index_test.exs b/test/mv_web/user_live/index_test.exs
index c0b0275..360ef72 100644
--- a/test/mv_web/user_live/index_test.exs
+++ b/test/mv_web/user_live/index_test.exs
@@ -33,8 +33,6 @@ defmodule MvWeb.UserLive.IndexTest do
assert html =~ "alice@example.com"
assert html =~ "bob@example.com"
- assert html =~ "alice123"
- assert html =~ "bob456"
end
test "shows correct action links", %{conn: conn} do
@@ -386,10 +384,6 @@ defmodule MvWeb.UserLive.IndexTest do
# Should still show the table structure
assert html =~ "Email"
- assert html =~ "OIDC ID"
- # Should show the authenticated user at minimum
- # Matches the generated email pattern oidc.user{unique_id}@example.com
- assert html =~ "oidc.user"
end
test "handles users with missing OIDC ID", %{conn: conn} do