Bugzilla – Attachment 174736 Details for
Bug 38436
Adjust code for column visibility (after DataTables upgrade)
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 38436: Fix patron categories
Bug-38436-Fix-patron-categories.patch (text/plain), 6.21 KB, created by
Owen Leonard
on 2024-11-18 15:41:25 UTC
(
hide
)
Description:
Bug 38436: Fix patron categories
Filename:
MIME Type:
Creator:
Owen Leonard
Created:
2024-11-18 15:41:25 UTC
Size:
6.21 KB
patch
obsolete
>From 3d28e80d3833863b3933214fb01dd80c6d6d52b5 Mon Sep 17 00:00:00 2001 >From: Jonathan Druart <jonathan.druart@bugs.koha-community.org> >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 <oleonard@myacpl.org> >--- > 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 @@ > <table id="patron_categories"> > <thead> > <tr> >- <th scope="col">Code</th> >- <th scope="col">Category name</th> >- <th scope="col">Type</th> >- <th scope="col">Enrollment period</th> >- <th scope="col">Password expiration</th> >- <th scope="col">Age required</th> >- <th scope="col">Upper age limit</th> >- <th scope="col">Enrollment fee</th> >- <th scope="col">Overdue</th> >- <th scope="col">Lost items</th> >- <th scope="col">Hold fee</th> >+ <th scope="col" data-colname="code">Code</th> >+ <th scope="col" data-colname="category_name">Category name</th> >+ <th scope="col" data-colname="type">Type</th> >+ <th scope="col" data-colname="enrollment_period">Enrollment period</th> >+ <th scope="col" data-colname="password_expiration">Password expiration</th> >+ <th scope="col" data-colname="age_required">Age required</th> >+ <th scope="col" data-colname="upper_age_limit">Upper age limit</th> >+ <th scope="col" data-colname="enrollment_fee">Enrollment fee</th> >+ <th scope="col" data-colname="overdue">Overdue</th> >+ <th scope="col" data-colname="lost_items">Lost items</th> >+ <th scope="col" data-colname="hold_fee">Hold fee</th> > [% IF ( EnhancedMessagingPreferences ) %] >- <th scope="col">Messaging</th> >+ <th scope="col" data-colname="messaging">Messaging</th> > [% END %] >- <th scope="col">Library limitations</th> >+ <th scope="col" data-colname="branches_limitations">Library limitations</th> > [% IF ( Koha.Preference('CheckPrevCheckout') == 'softyes' || Koha.Preference('CheckPrevCheckout') == 'softno' ) %] >- <th scope="col">Check previous checkout?</th> >+ <th scope="col" data-colname="check_previous_checkout">Check previous checkout?</th> > [% END %] > [% IF ( Koha.Preference('ILLModule') ) %] >- <th scope="col">Can place ILL in OPAC?</th> >+ <th scope="col" data-colname="can_place_ill_in_opac">Can place ILL in OPAC?</th> > [% END %] >- <th scope="col">Can be guarantee</th> >- <th scope="col">Default privacy</th> >- <th scope="col">Exclude from local holds priority</th> >- <th scope="col">Checkout charge limit</th> >- <th scope="col">Guarantees checkout charge limit</th> >- <th scope="col">Guarantors with guarantees checkout charge limit</th> >- <th scope="col">Actions</th> >+ <th scope="col" data-colname="can_be_guarantee">Can be guarantee</th> >+ <th scope="col" data-colname="default_privacy">Default privacy</th> >+ <th scope="col" data-colname="exclude_from_local_holds_priority">Exclude from local holds priority</th> >+ <th scope="col" data-colname="checkout_charge_limit">Checkout charge limit</th> >+ <th scope="col" data-colname="guarantees_checkout_charge_limit">Guarantees checkout charge limit</th> >+ <th scope="col" data-colname="guarantors_checkout_charge_limit">Guarantors with guarantees checkout charge limit</th> >+ <th scope="col" data-colname="actions">Actions</th> > </tr> > </thead> > <tbody> >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
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 38436
:
174587
|
174588
|
174589
|
174590
|
174591
|
174592
|
174593
|
174594
|
174595
|
174634
|
174641
|
174642
|
174688
|
174689
|
174690
|
174691
|
174692
|
174693
|
174694
|
174695
|
174696
|
174697
|
174698
|
174699
|
174700
|
174701
|
174702
|
174721
|
174722
|
174723
|
174724
|
174725
|
174726
|
174727
|
174728
|
174729
|
174730
|
174731
|
174732
|
174733
|
174734
|
174735
|
174736
|
174740
|
174741
|
174742
|
174743
|
174744
|
174745
|
174746
|
174747
|
174748
|
174749
|
174750
|
174751
|
174752
|
174753
|
174754
|
174755
|
174756
|
174766
|
174767
|
174768
|
174769
|
174770
|
174771
|
174772
|
174773
|
174774
|
174775
|
174776
|
174777
|
174778
|
174779
|
174780
|
174781
|
174782
|
174821
|
174967