From e25f9c70641063a5152201fdef87ce60fa97c395 Mon Sep 17 00:00:00 2001 From: Antoine Augusti Date: Tue, 12 Sep 2023 14:56:50 +0200 Subject: [PATCH] Contacts BO : distinguer fonction et organisation (#3453) --- .../templates/backoffice/contact/index.html.heex | 4 +++- .../lib/transport_web/views/backoffice/contact_view.ex | 8 -------- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/apps/transport/lib/transport_web/templates/backoffice/contact/index.html.heex b/apps/transport/lib/transport_web/templates/backoffice/contact/index.html.heex index abd2e33369..782a40b250 100644 --- a/apps/transport/lib/transport_web/templates/backoffice/contact/index.html.heex +++ b/apps/transport/lib/transport_web/templates/backoffice/contact/index.html.heex @@ -31,6 +31,7 @@ Nom E-mail + Organisation Fonction @@ -38,7 +39,8 @@ <%= DB.Contact.display_name(contact) %> <%= contact.email %> - <%= contact_fonction(contact) %> + <%= contact.organization %> + <%= contact.job_title %> <%= form_for @conn, backoffice_contact_path(@conn, :edit, contact.id), [nodiv: true, method: "get"], fn _ -> %> <%= submit("Éditer", class: "button", nodiv: true) %> diff --git a/apps/transport/lib/transport_web/views/backoffice/contact_view.ex b/apps/transport/lib/transport_web/views/backoffice/contact_view.ex index 26528dd40d..f95a90a9af 100644 --- a/apps/transport/lib/transport_web/views/backoffice/contact_view.ex +++ b/apps/transport/lib/transport_web/views/backoffice/contact_view.ex @@ -11,14 +11,6 @@ defmodule TransportWeb.Backoffice.ContactView do PaginationHelpers.pagination_links(conn, contacts, kwargs) end - defp contact_fonction(%DB.Contact{job_title: nil, organization: organization}) do - organization - end - - defp contact_fonction(%DB.Contact{job_title: job_title, organization: organization}) do - "#{job_title} (#{organization})" - end - defp notification_subscriptions_with_dataset(records) do records |> Enum.reject(&is_nil(&1.dataset_id))