Attachment 152046 Details for Bug 33845 – Bug 33845: (follow-up) Rename config and add a second configuration section

[patch] Bug 33845: (follow-up) Rename config and add a second configuration section

Bug-33845-follow-up-Rename-config-and-add-a-second.patch (text/plain), 4.81 KB, created by Nick Clemens (kidclamp) on 2023-06-06 12:42:51 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Nick Clemens (kidclamp)

Created: 2023-06-06 12:42:51 UTC

Size: 4.81 KB

patch

obsolete

>From 837398dab8ad277bca35a758657733306fd9eee7 Mon Sep 17 00:00:00 2001
>From: Nick Clemens <nick@bywatersolutions.com>
>Date: Tue, 6 Jun 2023 12:40:50 +0000
>Subject: [PATCH] Bug 33845: (follow-up) Rename config and add a second
> configuration section
>
>This patch renames the table in the columns configuration to match the id
>used in the templates
>
>It also adds a section for the moremember table to alllow config of each page as we do for issues
>
>Lastly we add the table controls as they exist on the issues tables
>---
> admin/columns_settings.yml                    | 34 ++++++++++++++++++-
> .../prog/en/modules/circ/circulation.tt       |  2 +-
> .../prog/en/modules/members/moremember.tt     |  2 +-
> koha-tmpl/intranet-tmpl/prog/js/holds.js      |  2 +-
> 4 files changed, 36 insertions(+), 4 deletions(-)
>
>diff --git a/admin/columns_settings.yml b/admin/columns_settings.yml
>index 83a1c56e95..3b6c61846a 100644
>--- a/admin/columns_settings.yml
>+++ b/admin/columns_settings.yml
>@@ -1057,6 +1057,38 @@ modules:
>               cannot_be_toggled: 1
>               cannot_be_modified: 1
> 
>+      holds-table:
>+        columns:
>+            -
>+              columnname: reservedate
>+            -
>+              columnname: title
>+            -
>+              columnname: callnumber
>+            -
>+              columnname: itemtype
>+            -
>+              columnname: barcode
>+            -
>+              columnname: pickup_location
>+            -
>+              columnname: expirationdate
>+            -
>+              columnname: priority
>+            -
>+              columnname: notes
>+              is_hidden: 1
>+            -
>+              columnname: delete
>+              cannot_be_toggled: 1
>+              cannot_be_modified: 1
>+            -
>+              columnname: suspend
>+              cannot_be_toggled: 1
>+              cannot_be_modified: 1
>+            -
>+              columnname: status
>+
>       relatives-issues-table:
>         columns:
>             -
>@@ -1432,7 +1464,7 @@ modules:
>               columnname: phone
>               is_hidden: 1
> 
>-      holds_table:
>+      holds-table:
>         columns:
>             -
>               columnname: reservedate
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
>index c07b04d278..ae46e85ebf 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
>@@ -1071,7 +1071,7 @@
>         table_settings_issues_table = [% TablesSettings.GetTableSettings( 'circ', 'circulation', 'issues-table', 'json' ) | $raw %]
>         table_settings_relatives_issues_table = [% TablesSettings.GetTableSettings( 'circ', 'circulation', 'relatives-issues-table', 'json' ) | $raw %]
>         table_settings_borrowers_table = [% TablesSettings.GetTableSettings( 'circ', 'circulation', 'table_borrowers', 'json' ) | $raw %]
>-        table_settings_holds_table = [% TablesSettings.GetTableSettings( 'circ', 'circulation', 'holds_table', 'json' ) | $raw %]
>+        table_settings_holds_table = [% TablesSettings.GetTableSettings( 'circ', 'circulation', 'holds-table', 'json' ) | $raw %]
> 
>         [% IF borrowernumber and patron %]
>             if( Cookies.get("holdfor") != [% patron.borrowernumber | html %]){
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt
>index 7569d40eb4..456b643107 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt
>@@ -923,7 +923,7 @@
> 
>         table_settings_issues_table = [% TablesSettings.GetTableSettings( 'members', 'moremember', 'issues-table', 'json' ) | $raw %]
>         table_settings_relatives_issues_table = [% TablesSettings.GetTableSettings( 'members', 'moremember', 'relatives-issues-table', 'json' ) | $raw %]
>-        table_settings_holds_table = [% TablesSettings.GetTableSettings( 'circ', 'circulation', 'holds_table', 'json' ) | $raw %]
>+        table_settings_holds_table = [% TablesSettings.GetTableSettings( 'members', 'moremember', 'holds-table', 'json' ) | $raw %]
> 
>         $(document).ready(function() {
>             $("#info_digests").tooltip();
>diff --git a/koha-tmpl/intranet-tmpl/prog/js/holds.js b/koha-tmpl/intranet-tmpl/prog/js/holds.js
>index 9dff614d06..64ed67d196 100644
>--- a/koha-tmpl/intranet-tmpl/prog/js/holds.js
>+++ b/koha-tmpl/intranet-tmpl/prog/js/holds.js
>@@ -128,7 +128,7 @@ $(document).ready(function() {
>             var title;
>             holdsTable = KohaTable("holds-table", {
>                 "bAutoWidth": false,
>-                "dom": "rt",
>+                "dom": '<"table_controls"B>rt',
>                 "aoColumns": [
>                     {
>                         "data": { _: "reservedate_formatted", "sort": "reservedate" }
>-- 
>2.30.2

Actions: View | Diff | Splinter Review

Attachments on bug 33845: 151754 | 151755 | 151756 | 151757 | 151765 | 151766 | 151767 | 151768 | 152046 | 156416 | 156417 | 156418 | 156419 | 156420 | 156421 | 156692 | 156693 | 156694 | 156695 | 156696 | 156697