From ec5916c7f23de2769397bc742acb9a471dab6930 Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Mon, 9 Jun 2025 12:46:45 +0000 Subject: [PATCH] Bug 40086: Table settings for Article Requests tables This patch adds table settings for the three tables on the article requests page in the staff interface: New, Pending, and Processing. The patch also disables sorting on the checkbox column and adds "anti-the" sorting to the title column. To test, apply the patch and restart services. - If necessary, enable article requests in at least one rule in Circulation and Fine Rules. - If there are no article requests in your system, log in to the OPAC as a user who can place article requests and submit multiple requests for various titles. - Go to Circulation -> Article requests - If there are no requests under the "Pending" and "Processing" tables, use the "Actions" menu to set some as pending and some as processing. - Test the "Columns" menu for each table, confirming that the correct columns are shown or hidden according to your selections. - Test sorting of the "Title" column to confirm that articles are ignored in sorting. - Go to Administration -> Table settings -> Circulation -> Article requests and try making various changes to the default configuration. - Return to the Article requests page to confirm that your selections are reflected there* * You may need to delete the table settings in local storage in order for the default table settings to be shown. In Firefox DevTools look under the "Storage" tab -> Local storage -> Delete all. Sponsored-by: Athens County Public Libraries --- admin/columns_settings.yml | 123 +++++++++++++++++- .../prog/en/modules/circ/article-requests.tt | 23 ++-- 2 files changed, 133 insertions(+), 13 deletions(-) diff --git a/admin/columns_settings.yml b/admin/columns_settings.yml index f4820008150..86a75dd11cb 100644 --- a/admin/columns_settings.yml +++ b/admin/columns_settings.yml @@ -1019,11 +1019,11 @@ modules: usage_data_providers: usage_data_providers: columns: - - + - columnname: name - columnname: description - - + - columnname: actions cannot_be_toggled: 1 cannot_be_modified: 1 @@ -1041,7 +1041,7 @@ modules: columnname: filename - columnname: importdate - - + - columnname: actions cannot_be_toggled: 1 cannot_be_modified: 1 @@ -1628,6 +1628,121 @@ modules: cannot_be_modified: 1 circ: + article-requests: + article-requests-requested-table: + default_sort_order: 13 + columns: + - + columnname: selections + cannot_be_toggled: 1 + cannot_be_modified: 1 + - + columnname: title + - + columnname: requested_article + - + columnname: collection + - + columnname: item_type + - + columnname: call_number + - + columnname: status + - + columnname: copy_number + - + columnname: enumeration + - + columnname: barcode + - + columnname: format + - + columnname: urls + - + columnname: patron + - + columnname: date + - + columnname: actions + cannot_be_toggled: 1 + cannot_be_modified: 1 + + article-requests-pending-table: + default_sort_order: 13 + columns: + - + columnname: selections + cannot_be_toggled: 1 + cannot_be_modified: 1 + - + columnname: title + - + columnname: requested_article + - + columnname: collection + - + columnname: item_type + - + columnname: call_number + - + columnname: status + - + columnname: copy_number + - + columnname: enumeration + - + columnname: barcode + - + columnname: format + - + columnname: urls + - + columnname: patron + - + columnname: date + - + columnname: actions + cannot_be_toggled: 1 + cannot_be_modified: 1 + + article-requests-processing-table: + default_sort_order: 13 + columns: + - + columnname: selections + cannot_be_toggled: 1 + cannot_be_modified: 1 + - + columnname: title + - + columnname: requested_article + - + columnname: collection + - + columnname: item_type + - + columnname: call_number + - + columnname: status + - + columnname: copy_number + - + columnname: enumeration + - + columnname: barcode + - + columnname: format + - + columnname: urls + - + columnname: patron + - + columnname: date + - + columnname: actions + cannot_be_toggled: 1 + cannot_be_modified: 1 + circulation: issues-table: columns: @@ -2580,4 +2695,4 @@ modules: - columnname: actions cannot_be_toggled: 1 - cannot_be_modified: 1 \ No newline at end of file + cannot_be_modified: 1 diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/article-requests.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/article-requests.tt index a92f177f8d7..cfb47daa5c4 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/article-requests.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/article-requests.tt @@ -5,6 +5,7 @@ [% USE AuthorisedValues %] [% USE Asset %] [% USE raw %] +[% USE TablesSettings %] [% PROCESS 'i18n.inc' %] [% SET footerjs = 1 %] [% INCLUDE 'doc-head-open.inc' %] @@ -207,8 +208,8 @@ - + + @@ -314,8 +315,8 @@
- TitleTitle Requested article Collection Item type
- + + @@ -420,8 +421,8 @@
- Title Title Requested article Collection Item type
- + + @@ -574,13 +575,17 @@ if( link.length > 0 ) link[0].focus(); }); - requested_datatable = $("#article-requests-requested-table").kohaTable(); + let requested_table_settings = [% TablesSettings.GetTableSettings( 'circ', 'article-requests', 'article-requests-requested-table', 'json' ) | $raw %] + let pending_table_settings = [% TablesSettings.GetTableSettings( 'circ', 'article-requests', 'article-requests-pending-table', 'json' ) | $raw %] + let processing_table_settings = [% TablesSettings.GetTableSettings( 'circ', 'article-requests', 'article-requests-processing-table', 'json' ) | $raw %] + + requested_datatable = $("#article-requests-requested-table").kohaTable({}, requested_table_settings); requested_dt = requested_datatable.DataTable(); - pending_datatable = $("#article-requests-pending-table").kohaTable(); + pending_datatable = $("#article-requests-pending-table").kohaTable({}, pending_table_settings); pending_dt = pending_datatable.DataTable(); - processing_datatable = $("#article-requests-processing-table").kohaTable(); + processing_datatable = $("#article-requests-processing-table").kohaTable({}, processing_table_settings); processing_dt = processing_datatable.DataTable(); active_datatable = requested_datatable; -- 2.39.5
- Title Title Requested article Collection Item type