From c5cde959621b286900a16f9745e321df2ecbe936 Mon Sep 17 00:00:00 2001 From: Lucas Gass Date: Wed, 5 Jun 2024 22:14:00 +0000 Subject: [PATCH] Bug 35635: Split mandatory field into mandatory and opac_mandatory Signed-off-by: Brendan Lawlor Signed-off-by: Jonathan Druart --- admin/patron-attr-types.pl | 2 ++ .../prog/en/modules/admin/patron-attr-types.tt | 12 ++++++++++-- .../bootstrap/en/modules/opac-memberentry.tt | 8 ++++---- 3 files changed, 16 insertions(+), 6 deletions(-) diff --git a/admin/patron-attr-types.pl b/admin/patron-attr-types.pl index 401522b6046..c4018907af3 100755 --- a/admin/patron-attr-types.pl +++ b/admin/patron-attr-types.pl @@ -116,6 +116,7 @@ sub add_update_attribute_type { my $searched_by_default = $input->param('searched_by_default') ? 1 : 0; my $keep_for_pseudonymization = $input->param('keep_for_pseudonymization') ? 1 : 0; my $mandatory = $input->param('mandatory') ? 1 : 0; + my $opac_mandatory = $input->param('opac_mandatory') ? 1 : 0; my $authorised_value_category = $input->param('authorised_value_category'); my $display_checkout = $input->param('display_checkout') ? 1 : 0; my $category_code = $input->param('category_code') || undef; @@ -153,6 +154,7 @@ sub add_update_attribute_type { searched_by_default => $searched_by_default, keep_for_pseudonymization => $keep_for_pseudonymization, mandatory => $mandatory, + opac_mandatory => $opac_mandatory, authorised_value_category => $authorised_value_category, display_checkout => $display_checkout, category_code => $category_code, diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/patron-attr-types.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/patron-attr-types.tt index 57748196e1d..40882744f53 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/patron-attr-types.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/patron-attr-types.tt @@ -194,13 +194,21 @@ field to be marked as searchable above -
  • +
  • [% IF attribute_type AND attribute_type.mandatory %] [% ELSE %] [% END %] - Check to make this attribute mandatory when creating or editing a patron. + Check to make this attribute mandatory when creating or editing a patron from the staff interface. +
  • +
  • + [% IF attribute_type AND attribute_type.opac_mandatory %] + + [% ELSE %] + + [% END %] + Check to make this attribute mandatory when creating or editing a patron from the OPAC.
  • [% IF attribute_type AND attribute_type.display_checkout %] diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-memberentry.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-memberentry.tt index 0eafb0cbd5f..b3079e465a6 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-memberentry.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-memberentry.tt @@ -995,7 +995,7 @@ [% IF loop.first %][% END %] [% form_id = 'patron-attr-' _ Math.int( Math.rand(1000000) ) %]
  • - [% IF pa.type.mandatory && pa.type.opac_editable %] + [% IF pa.type.opac_mandatory && pa.type.opac_editable %] [% ELSE %] @@ -1018,9 +1018,9 @@ [% END %] [% ELSE %] - [% IF ( pa.type.is_date && pa.type.mandatory ) %] + [% IF ( pa.type.is_date && pa.type.opac_mandatory ) %] - [% ELSIF ( pa.type.is_date && !pa.type.mandatory ) %] + [% ELSIF ( pa.type.is_date && !pa.type.opac_mandatory ) %] [% ELSE %] @@ -1033,7 +1033,7 @@ [% IF ( pa.type.repeatable ) %] New [% END %] - [% IF pa.type.mandatory %] + [% IF pa.type.opac_mandatory %] Required [% END %] -- 2.34.1