From ffa8bbe162d9eed633411493f9ff3ef7d09909bb Mon Sep 17 00:00:00 2001 From: Pedro Amorim Date: Tue, 10 Dec 2024 11:03:15 +0000 Subject: [PATCH] Bug 38662: Group tables by module name Test plan: 1) Before applying patches, visit the additional fields admin page: /cgi-bin/koha/admin/additional-fields.pl 2) Notice the tables are not grouped by module, and not alphabetically sorted 3) Apply patches. Refresh Signed-off-by: Owen Leonard Signed-off-by: Martin Renvoize --- .../en/modules/admin/additional-fields.tt | 40 ++++++++++++------- 1 file changed, 26 insertions(+), 14 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/additional-fields.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/additional-fields.tt index 3cf17ac6160..51f47e483e4 100755 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/additional-fields.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/additional-fields.tt @@ -121,27 +121,39 @@ [% BLOCK table_option %]
  • [% content | $raw %] ([% value | html %])
  • [% END %] -
      - [% IF CAN_user_acquisition_order_manage %] - [% WRAPPER table_option value="aqbasket" %]Order baskets[% END %] - [% WRAPPER table_option value="aqorders" %]Order lines[% END %] - [% END %] - [% IF CAN_user_acquisition_edit_invoices %] - [% WRAPPER table_option value="aqinvoices" %]Invoices[% END %] + [% IF CAN_user_acquisition_order_manage || CAN_user_acquisition_edit_invoices %] +

      Acquisitions

      +
        + [% IF CAN_user_acquisition_order_manage %] + [% WRAPPER table_option value="aqbasket" %]Order baskets[% END %] + [% WRAPPER table_option value="aqorders" %]Order lines[% END %] + [% END %] + [% IF CAN_user_acquisition_edit_invoices %] + [% WRAPPER table_option value="aqinvoices" %]Invoices[% END %] + [% END %] +
      [% END %] [% IF CAN_user_serials_edit_subscription %] - [% WRAPPER table_option value="subscription" %]Subscriptions[% END %] +

      Serials

      +
        + [% WRAPPER table_option value="subscription" %]Subscriptions[% END %] +
      [% END %] [% IF CAN_user_updatecharges_remaining_permissions %] - [% WRAPPER table_option value="accountlines:credit" %]Account lines (credit)[% END %] - [% WRAPPER table_option value="accountlines:debit" %]Account lines (debit)[% END %] +

      Members

      +
        + [% WRAPPER table_option value="accountlines:credit" %]Account lines (credit)[% END %] + [% WRAPPER table_option value="accountlines:debit" %]Account lines (debit)[% END %] +
      [% END %] [% IF CAN_user_erm %] - [% WRAPPER table_option value="erm_licenses" %]ERM licenses[% END %] - [% WRAPPER table_option value="erm_agreements" %]ERM agreements[% END %] - [% WRAPPER table_option value="erm_packages" %]ERM packages[% END %] +

      E-resource management

      +
        + [% WRAPPER table_option value="erm_licenses" %]ERM licenses[% END %] + [% WRAPPER table_option value="erm_agreements" %]ERM agreements[% END %] + [% WRAPPER table_option value="erm_packages" %]ERM packages[% END %] +
      [% END %] -
    [% ELSE %] Additional permissions are required for editing additional fields [% END %] -- 2.47.1