From 49edbe1e8483b1317002b3231501a9650595e7c6 Mon Sep 17 00:00:00 2001 From: Pedro Amorim Date: Wed, 21 May 2025 12:40:04 +0000 Subject: [PATCH] Bug 39971: Move form rendering to reusable tt block --- .../en/includes/member-attribute-types.inc | 84 ++++++++++++++++++ .../prog/en/modules/members/memberentrygen.tt | 86 +------------------ 2 files changed, 86 insertions(+), 84 deletions(-) create mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/member-attribute-types.inc diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/member-attribute-types.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/member-attribute-types.inc new file mode 100644 index 00000000000..dfdf17d8192 --- /dev/null +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/member-attribute-types.inc @@ -0,0 +1,84 @@ +[% BLOCK 'memberentry_patron_attributes_form' %] + [% UNLESS ( no_patron_attribute_types ) %] +
+ + + Additional attributes and identifiers + +
+ + [% FOREACH pa_loo IN patron_attributes %] +
    +
    + [% IF pa_loo.class %] +

    [% pa_loo.lib | html %]

    + [% END %] + [% FOREACH patron_attribute IN pa_loo.items %] +
  1. + [% IF patron_attribute.mandatory %] + + [% ELSE %] + + [% END %] + [% IF ( patron_attribute.use_dropdown ) %] + + [% ELSE %] + [% IF patron_attribute.mandatory %] + [% IF patron_attribute.is_date %] + + [% ELSE %] + + [% END %] + [% ELSE %] + [% IF patron_attribute.is_date %] + + [% ELSE %] + + [% END %] + [% END %] + [% END # /IF ( patron_attribute.use_dropdown ) %] + + [% IF ( !patron_attribute.is_date ) %] + Clear + [% END %] + [% IF ( patron_attribute.repeatable ) %] + New + [% END %] + [% IF patron_attribute.mandatory %]Required[% END %] +
  2. + [% END # /FOREACH patron_attribute %] +
    +
+ [% END # /FOREACH pa_loo %] +
+ +
+ + [% END # UNLESS ( no_patron_attribute_types ) %] +[% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt index 361a178107c..c69ef3b655f 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt @@ -7,6 +7,7 @@ [% PROCESS 'member-main-address-style.inc' %] [% PROCESS 'member-alt-address-style.inc' %] [% PROCESS 'member-alt-contact-style.inc' %] +[% PROCESS 'member-attribute-types.inc' %] [% PROCESS 'restriction-types.inc' %] [% PROCESS 'i18n.inc' %] [% SET footerjs = 1 %] @@ -1505,90 +1506,7 @@ [% IF ( step_4 ) %] [% IF Koha.Preference('ExtendedPatronAttributes') %] - [% UNLESS ( no_patron_attribute_types ) %] -
- - - Additional attributes and identifiers - -
- - [% FOREACH pa_loo IN patron_attributes %] -
    -
    - [% IF pa_loo.class %] -

    [% pa_loo.lib | html %]

    - [% END %] - [% FOREACH patron_attribute IN pa_loo.items %] -
  1. - [% IF patron_attribute.mandatory %] - - [% ELSE %] - - [% END %] - [% IF ( patron_attribute.use_dropdown ) %] - - [% ELSE %] - [% IF patron_attribute.mandatory %] - [% IF patron_attribute.is_date %] - - [% ELSE %] - - [% END %] - [% ELSE %] - [% IF patron_attribute.is_date %] - - [% ELSE %] - - [% END %] - [% END %] - [% END # /IF ( patron_attribute.use_dropdown ) %] - - [% IF ( !patron_attribute.is_date ) %] - Clear - [% END %] - [% IF ( patron_attribute.repeatable ) %] - New - [% END %] - [% IF patron_attribute.mandatory %]Required[% END %] -
  2. - [% END # /FOREACH patron_attribute %] -
    -
- [% END # /FOREACH pa_loo %] -
- -
- - [% END # UNLESS ( no_patron_attribute_types ) %] + [% PROCESS 'memberentry_patron_attributes_form' patron_attributes=patron_attributes %] [% END # IF Koha.Preference('ExtendedPatronAttributes') %] [% END # IF ( step_4 ) %] -- 2.39.5