From 84ef1c97d5e5f3234bb5328fc0f34bf714a6b566 Mon Sep 17 00:00:00 2001 From: Arnaud Levy <contact@arnaudlevy.com> Date: Mon, 20 Dec 2021 17:40:56 +0100 Subject: [PATCH] one field --- .../admin/education/programs/_form.html.erb | 27 +++++++++++++++++-- .../admin/education/programs/show.html.erb | 2 +- config/locales/fr.yml | 3 +++ 3 files changed, 29 insertions(+), 3 deletions(-) diff --git a/app/views/admin/education/programs/_form.html.erb b/app/views/admin/education/programs/_form.html.erb index 230766016..7e83bdd7d 100644 --- a/app/views/admin/education/programs/_form.html.erb +++ b/app/views/admin/education/programs/_form.html.erb @@ -14,7 +14,7 @@ data: { source: '#education_program_name' } } %> <%= f.input :published %> - <%= f.input :level, include_blank: false, label_method: -> (p) { I18n.t(p[1], scope: 'enums.education/program.level') } %> + <%= f.input :level, include_blank: false %> <%= f.input :capacity %> <%= f.input :ects %> <%= f.input :continuing %> @@ -49,7 +49,30 @@ </div> <div class="card-body"> <%= f.input :description %> - <%= f.input :registration, as: :rich_text_area %> + <% + prop = :registration + best_prop_value = program.public_send("best_#{prop}") + best_prop_source = program.public_send("best_#{prop}_source") + %> + <% if best_prop_source %> + <div class="accordion mb-3"> + <div class="accordion-item"> + <a href="#registrationCollapse" class="accordion-button collapsed" data-bs-toggle="collapse" aria-expanded="false" aria-controls="registrationCollapse"> + <%= Education::Program.human_attribute_name(prop) %> + (<%= t 'admin.inheritance.status' %>) + </a> + </div> + <div class="collapse" id="registrationCollapse"> + <%= f.input :registration, as: :rich_text_area, label: false %> + <div class="bg-light p-2 mt-n2"> + <b><%= t 'admin.inheritance.sentence_html', link: link_to(best_prop_source, [:admin, best_prop_source]) %></b><br> + <%= program.best_registration %> + </div> + </div> + </div> + <% else %> + <%= f.input :registration, as: :rich_text_area %> + <% end %> <%= f.input :pricing, as: :rich_text_area %> <%= f.input :duration, as: :rich_text_area %> <%= f.input :accessibility, as: :rich_text_area %> diff --git a/app/views/admin/education/programs/show.html.erb b/app/views/admin/education/programs/show.html.erb index fc31a9774..fe12adf4d 100644 --- a/app/views/admin/education/programs/show.html.erb +++ b/app/views/admin/education/programs/show.html.erb @@ -55,7 +55,7 @@ <%= Education::Program.human_attribute_name(prop) %> <% if best_prop_source %> <span class="small text-muted"> - (valeur héritée de <%= link_to best_prop_source, [:admin, best_prop_source] %>) + <%= t 'admin.inheritance.sentence_html', link: link_to(best_prop_source, [:admin, best_prop_source]) %> </span> <% end %> </h3> diff --git a/config/locales/fr.yml b/config/locales/fr.yml index 72edb7092..0c9b69197 100644 --- a/config/locales/fr.yml +++ b/config/locales/fr.yml @@ -43,6 +43,9 @@ fr: one: Utilisateur·rice other: Utilisateur·rice·s admin: + inheritance: + status: Valeur héritée + sentence_html: Valeur héritée de %{link} attachment_not_available: Impossible d'accéder à l'élément dashboard: Tableau de bord infos: Infos -- GitLab