From 8046b566d5a3e37ae91f08632f6bc911b80dedac Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Mon, 18 Nov 2024 14:48:42 +0100 Subject: [PATCH] Bug 38436: Fix patron categories Make it use bKohaColumnsUseNames as we are building the columns depending on sysprefs. Note that the hard-coded list of columns to export is wrong exportColumns: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12], Must use .noExport instead. Signed-off-by: Owen Leonard Signed-off-by: Paul Derscheid --- admin/columns_settings.yml | 10 +++++ .../prog/en/modules/admin/categories.tt | 44 +++++++++---------- koha-tmpl/intranet-tmpl/prog/js/categories.js | 1 + 3 files changed, 33 insertions(+), 22 deletions(-) diff --git a/admin/columns_settings.yml b/admin/columns_settings.yml index 293a109bf0..815fcee119 100644 --- a/admin/columns_settings.yml +++ b/admin/columns_settings.yml @@ -326,12 +326,22 @@ modules: columnname: messaging - columnname: branches_limitations + - + columnname: check_previous_checkout + - + columnname: can_place_ill_in_opac - columnname: can_be_guarantee - columnname: default_privacy - columnname: exclude_from_local_holds_priority + - + columnname: checkout_charge_limit + - + columnname: guarantees_checkout_charge_limit + - + columnname: guarantors_checkout_charge_limit - columnname: actions cannot_be_toggled: 1 diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categories.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categories.tt index 440da9eade..a162519f98 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categories.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categories.tt @@ -616,34 +616,34 @@ - - - - - - - - - - - + + + + + + + + + + + [% IF ( EnhancedMessagingPreferences ) %] - + [% END %] - + [% IF ( Koha.Preference('CheckPrevCheckout') == 'softyes' || Koha.Preference('CheckPrevCheckout') == 'softno' ) %] - + [% END %] [% IF ( Koha.Preference('ILLModule') ) %] - + [% END %] - - - - - - - + + + + + + + diff --git a/koha-tmpl/intranet-tmpl/prog/js/categories.js b/koha-tmpl/intranet-tmpl/prog/js/categories.js index 65ec948afd..a6f47829b1 100644 --- a/koha-tmpl/intranet-tmpl/prog/js/categories.js +++ b/koha-tmpl/intranet-tmpl/prog/js/categories.js @@ -49,6 +49,7 @@ $(document).ready(function () { ], pagingType: "full", exportColumns: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12], + bKohaColumnsUseNames: true, }, table_settings ); -- 2.39.5
CodeCategory nameTypeEnrollment periodPassword expirationAge requiredUpper age limitEnrollment feeOverdueLost itemsHold feeCodeCategory nameTypeEnrollment periodPassword expirationAge requiredUpper age limitEnrollment feeOverdueLost itemsHold feeMessagingMessagingLibrary limitationsLibrary limitationsCheck previous checkout?Check previous checkout?Can place ILL in OPAC?Can place ILL in OPAC?Can be guaranteeDefault privacyExclude from local holds priorityCheckout charge limitGuarantees checkout charge limitGuarantors with guarantees checkout charge limitActionsCan be guaranteeDefault privacyExclude from local holds priorityCheckout charge limitGuarantees checkout charge limitGuarantors with guarantees checkout charge limitActions