diff --git a/CHANGELOG.md b/CHANGELOG.md
index edb53f9..74d015d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,11 +8,17 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
## [Unreleased]
### Added
+- **GDPR/DSGVO join-form description** – Custom fields can carry a "join form description" that is shown as the field's label on the public join form, with clickable external links (whole URLs and Markdown `[text](url)`). Useful for presenting a GDPR confirmation with a link to an externally hosted privacy declaration before sign-up.
+- **Join-form description tooltip in member details** – Custom fields that have a join-form description show an info tooltip (prefixed "Beitrittsformular:") on their label in the member detail view.
+- **Editable join-form description** – Admins can set a field's join-form description in the custom-field settings, with an inline hint about the supported link syntax.
- **CSV import – groups column** – Members can be assigned to groups during CSV import via a `Groups`/`Gruppen` column; group names that do not exist yet are created automatically, and re-importing the same file does not create duplicate groups.
- **CSV import – membership fee type column** – A `Fee Type`/`Beitragsart` column assigns each member's membership fee type; an unknown name falls back to the default fee type and is flagged in the preview with a link to create it.
- **CSV import – mapping preview** – After uploading a file, a preview shows how every column maps (with sample rows and warnings for ignored or unknown columns) and the import only starts once you confirm.
- **Dynamic CSV import templates** – The EN and DE import-template downloads now include the association's current custom fields instead of a fixed column set.
+### Changed
+- **Default GDPR custom field** – The seeded GDPR field was shortened from "Datenschutzerklärung akzeptiert" to "DSGVO" and now ships with a default join-form description (with a placeholder link to replace).
+
### Fixed
- **CSV date round-trip** – Date custom-field values are now exported as ISO-8601 (`YYYY-MM-DD`), so an exported CSV can be re-imported without date-parsing errors.
- **CSV import – fee-status columns ignored** – Columns such as `Bezahlstatus` / `Membership Fee Status` are always ignored on import and never stored as a custom-field value, even when a custom field of the same name exists.
diff --git a/lib/membership/custom_field.ex b/lib/membership/custom_field.ex
index ef6c79a..5f4dd0e 100644
--- a/lib/membership/custom_field.ex
+++ b/lib/membership/custom_field.ex
@@ -12,6 +12,8 @@ defmodule Mv.Membership.CustomField do
- `slug` - URL-friendly, immutable identifier automatically generated from name (e.g., "phone-mobile")
- `value_type` - Data type constraint (`:string`, `:integer`, `:boolean`, `:date`, `:email`). Immutable after creation.
- `description` - Optional human-readable description
+ - `join_description` - Optional label shown for this field on the public join form
+ (e.g., a GDPR confirmation text); supports inline external links. Falls back to `name` when nil.
- `required` - If true, all members must have this custom field (future feature)
- `show_in_overview` - If true, this custom field will be displayed in the member overview table and can be sorted
@@ -61,7 +63,14 @@ defmodule Mv.Membership.CustomField do
end
actions do
- default_accept [:name, :value_type, :description, :required, :show_in_overview]
+ default_accept [
+ :name,
+ :value_type,
+ :description,
+ :join_description,
+ :required,
+ :show_in_overview
+ ]
read :read do
primary? true
@@ -69,13 +78,13 @@ defmodule Mv.Membership.CustomField do
end
create :create do
- accept [:name, :value_type, :description, :required, :show_in_overview]
+ accept [:name, :value_type, :description, :join_description, :required, :show_in_overview]
change Mv.Membership.Changes.GenerateSlug
validate string_length(:slug, min: 1)
end
update :update do
- accept [:name, :description, :required, :show_in_overview]
+ accept [:name, :description, :join_description, :required, :show_in_overview]
require_atomic? false
validate fn changeset, _context ->
@@ -139,6 +148,15 @@ defmodule Mv.Membership.CustomField do
trim?: true
]
+ attribute :join_description, :string,
+ allow_nil?: true,
+ public?: true,
+ description: "Label shown for this field on the public join form; supports external links",
+ constraints: [
+ max_length: 1000,
+ trim?: true
+ ]
+
attribute :required, :boolean,
default: false,
allow_nil?: false
diff --git a/lib/mv_web/helpers/join_description_renderer.ex b/lib/mv_web/helpers/join_description_renderer.ex
new file mode 100644
index 0000000..4c4705f
--- /dev/null
+++ b/lib/mv_web/helpers/join_description_renderer.ex
@@ -0,0 +1,70 @@
+defmodule MvWeb.Helpers.JoinDescriptionRenderer do
+ @moduledoc """
+ Renders a custom field's `join_description` into Phoenix-safe HTML for the
+ public join form.
+
+ The renderer auto-links two patterns into `` tags:
+
+ - Markdown links of the form `[text](url)` (processed first)
+ - bare `http(s)://` URLs in the remaining text
+
+ All other content is HTML-escaped: only `` tags are ever
+ emitted, so arbitrary HTML in the input is rendered as inert text. This is a
+ defense-in-depth measure — `join_description` is admin-set content, never
+ end-user input — but the renderer must not become a vector for injecting
+ arbitrary markup.
+
+ Markdown links are matched before bare URLs and their matched region is
+ consumed, so a Markdown link whose URL also looks like a bare URL is linked
+ exactly once (no nested anchors).
+ """
+
+ @markdown_link ~r/\[([^\]]+)\]\((https?:\/\/[^\s)]+)\)/
+ @bare_url ~r/(https?:\/\/[^\s<]+)/
+ @bare_url_anchored ~r/\A(https?:\/\/[^\s<]+)\z/
+
+ @doc """
+ Converts `value` to a Phoenix-safe HTML iolist.
+
+ Returns `{:safe, ""}` for `nil`. For a string, returns `{:safe, iolist}` with
+ links rendered and all other text HTML-escaped.
+ """
+ @spec render(String.t() | nil) :: Phoenix.HTML.safe()
+ def render(nil), do: {:safe, ""}
+
+ def render(value) when is_binary(value) do
+ {:safe, render_segments(value)}
+ end
+
+ # Split on Markdown links first; for each non-Markdown segment, link bare URLs;
+ # everything that is not a link is HTML-escaped.
+ defp render_segments(text) do
+ Regex.split(@markdown_link, text, include_captures: true)
+ |> Enum.map(&render_markdown_or_plain/1)
+ end
+
+ defp render_markdown_or_plain(segment) do
+ case Regex.run(@markdown_link, segment) do
+ [^segment, label, url] -> anchor(url, label)
+ _ -> render_plain(segment)
+ end
+ end
+
+ # Auto-link bare URLs in a plain-text segment, escaping all surrounding text.
+ defp render_plain(segment) do
+ Regex.split(@bare_url, segment, include_captures: true)
+ |> Enum.map(fn part ->
+ if Regex.match?(@bare_url_anchored, part) do
+ anchor(part, part)
+ else
+ escape(part)
+ end
+ end)
+ end
+
+ defp anchor(url, label) do
+ ["", escape(label), ""]
+ end
+
+ defp escape(text), do: Phoenix.HTML.html_escape(text) |> Phoenix.HTML.safe_to_string()
+end
diff --git a/lib/mv_web/live/custom_field_live/form_component.ex b/lib/mv_web/live/custom_field_live/form_component.ex
index 2e98aeb..1663b4e 100644
--- a/lib/mv_web/live/custom_field_live/form_component.ex
+++ b/lib/mv_web/live/custom_field_live/form_component.ex
@@ -91,6 +91,45 @@ defmodule MvWeb.CustomFieldLive.FormComponent do
<% end %>
<.input field={@form[:description]} type="text" label={gettext("Description")} />
+
+
+
<.input field={@form[:required]} type="checkbox" label={gettext("Required")} />
<.input
field={@form[:show_in_overview]}
diff --git a/lib/mv_web/live/join_live.ex b/lib/mv_web/live/join_live.ex
index b679127..2c37f3a 100644
--- a/lib/mv_web/live/join_live.ex
+++ b/lib/mv_web/live/join_live.ex
@@ -8,6 +8,7 @@ defmodule MvWeb.JoinLive do
alias Ash.Resource.Info
alias Mv.Membership
alias Mv.Membership.CustomFieldLookup
+ alias MvWeb.Helpers.JoinDescriptionRenderer
alias MvWeb.JoinRateLimit
alias MvWeb.Translations.MemberFields
@@ -96,14 +97,20 @@ defmodule MvWeb.JoinLive do
class="checkbox checkbox-sm"
/>
- {field.label} *
+ {render_field_label(field)} *
<% else %>