Bugzilla – Attachment 195162 Details for
Bug 41569
Tidy kohaTable block - clubs
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 41569: (follow-up) Fix conflict with 39698
4b633fc.patch (text/plain), 8.11 KB, created by
Jonathan Druart
on 2026-03-12 10:29:43 UTC
(
hide
)
Description:
Bug 41569: (follow-up) Fix conflict with 39698
Filename:
MIME Type:
Creator:
Jonathan Druart
Created:
2026-03-12 10:29:43 UTC
Size:
8.11 KB
patch
obsolete
>From 4b633fc99504df968d3dae34c8789f6d5df68900 Mon Sep 17 00:00:00 2001 >From: Jonathan Druart <jonathan.druart@bugs.koha-community.org> >Date: Thu, 12 Mar 2026 11:29:03 +0100 >Subject: [PATCH] Bug 41569: (follow-up) Fix conflict with 39698 > >--- > .../en/modules/opac-authoritiessearchresultlist.tt | 14 +++++++------- > .../opac-tmpl/bootstrap/en/modules/opac-recalls.tt | 14 +++++++------- > .../bootstrap/en/modules/opac-search-history.tt | 14 +++++++------- > .../opac-tmpl/bootstrap/en/modules/opac-tags.tt | 10 ++++------ > .../bootstrap/en/modules/opac-topissues.tt | 12 ++++++------ > 5 files changed, 31 insertions(+), 33 deletions(-) > >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-authoritiessearchresultlist.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-authoritiessearchresultlist.tt >index 67a27211755..68692ad4d66 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-authoritiessearchresultlist.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-authoritiessearchresultlist.tt >@@ -119,14 +119,14 @@ > [% INCLUDE 'opac-bottom.inc' %] > [% BLOCK jsinclude %] > [% INCLUDE 'datatables.inc' %] >+ <script> >+ addPrefs({ >+ OPACTableColExpandedByDefault: [% Koha.Preference('OPACTableColExpandedByDefault') ? 1 : 0 | html %], >+ }); >+ </script> > <script type="text/JavaScript"> > $(document).ready(function () { >- [% IF ( Koha.Preference('OPACTableColExpandedByDefault') ) %] >- var responsive_display = DataTable.Responsive.display.childRowImmediate; >- [% ELSE %] >- var responsive_display = DataTable.Responsive.display.childRow; >- [% END %] >- >+ var responsive_display = prefs.OPACTableColExpandedByDefault ? DataTable.Responsive.display.childRowImmediate : DataTable.Responsive.display.childRow; > $(".table").kohaTable({ > searching: false, > paging: false, >@@ -135,7 +135,7 @@ > details: { > display: responsive_display, > type: "column", >- target: -1 >+ target: -1, > }, > }, > columnDefs: [{ className: "dtr-control", orderable: false, targets: -1 }], >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-recalls.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-recalls.tt >index 4e45260a8e1..6bb7fa5f893 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-recalls.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-recalls.tt >@@ -137,24 +137,24 @@ > [% INCLUDE 'opac-bottom.inc' %] > [% BLOCK jsinclude %] > [% INCLUDE 'datatables.inc' %] >+ <script> >+ addPrefs({ >+ OPACTableColExpandedByDefault: [% Koha.Preference('OPACTableColExpandedByDefault') ? 1 : 0 | html %], >+ }); >+ </script> > <script> > $(document).ready(function () { > $(".cancel_recall").click(function () { > return confirmDelete(_("Are you sure you want to remove this recall?")); > }); > >- [% IF ( Koha.Preference('OPACTableColExpandedByDefault') ) %] >- var responsive_display = DataTable.Responsive.display.childRowImmediate; >- [% ELSE %] >- var responsive_display = DataTable.Responsive.display.childRow; >- [% END %] >- >+ var responsive_display = prefs.OPACTableColExpandedByDefault ? DataTable.Responsive.display.childRowImmediate : DataTable.Responsive.display.childRow; > $("#recalls-table").kohaTable({ > responsive: { > details: { > display: responsive_display, > type: "column", >- target: -1 >+ target: -1, > }, > }, > columnDefs: [{ className: "dtr-control", orderable: false, targets: -1 }], >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-search-history.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-search-history.tt >index c5e154e2ccc..ad28cd3ca4b 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-search-history.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-search-history.tt >@@ -305,17 +305,17 @@ > > [% BLOCK jsinclude %] > [% INCLUDE 'datatables.inc' %] >+ <script> >+ addPrefs({ >+ OPACTableColExpandedByDefault: [% Koha.Preference('OPACTableColExpandedByDefault') ? 1 : 0 | html %], >+ }); >+ </script> > <script> > $(document).ready(function () { > // We show table ordered by descending dates by default > // (so that the more recent query is shown first) > >- [% IF ( Koha.Preference('OPACTableColExpandedByDefault') ) %] >- var responsive_display = DataTable.Responsive.display.childRowImmediate; >- [% ELSE %] >- var responsive_display = DataTable.Responsive.display.childRow; >- [% END %] >- >+ var responsive_display = prefs.OPACTableColExpandedByDefault ? DataTable.Responsive.display.childRowImmediate : DataTable.Responsive.display.childRow; > let history_tables = $(".historyt").kohaTable({ > order: [[1, "desc"]], > dom: '<"top"<"table_entries"><"table_controls"fB>>t', >@@ -328,7 +328,7 @@ > details: { > display: responsive_display, > type: "column", >- target: -1 >+ target: -1, > }, > }, > }); >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-tags.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-tags.tt >index 2190ba749fc..f4927fed12f 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-tags.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-tags.tt >@@ -253,6 +253,9 @@ > const loggedinusername = [% ( loggedinusername ) ? 1 : 0 | html %]; > const opacbookbag = [% ( opacbookbag ) ? 1 : 0 | html %]; > const virtualshelves = [% ( virtualshelves ) ? 1 : 0 | html %]; >+ addPrefs({ >+ OPACTableColExpandedByDefault: [% Koha.Preference('OPACTableColExpandedByDefault') ? 1 : 0 | html %], >+ }); > </script> > [% Asset.js("js/results-list.js") | $raw %] > <script> >@@ -302,12 +305,7 @@ > } > }); > >- [% IF ( Koha.Preference('OPACTableColExpandedByDefault') ) %] >- var responsive_display = DataTable.Responsive.display.childRowImmediate; >- [% ELSE %] >- var responsive_display = DataTable.Responsive.display.childRow; >- [% END %] >- >+ var responsive_display = prefs.OPACTableColExpandedByDefault ? DataTable.Responsive.display.childRowImmediate : DataTable.Responsive.display.childRow; > $("#mytagst").kohaTable({ > order: [[2, "asc"]], > columnDefs: [ >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-topissues.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-topissues.tt >index c14144dbd2d..6ed6fdba919 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-topissues.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-topissues.tt >@@ -152,14 +152,14 @@ > [% INCLUDE 'opac-bottom.inc' %] > [% BLOCK jsinclude %] > [% INCLUDE 'datatables.inc' %] >+ <script> >+ addPrefs({ >+ OPACTableColExpandedByDefault: [% Koha.Preference('OPACTableColExpandedByDefault') ? 1 : 0 | html %], >+ }); >+ </script> > <script> > $(function () { >- [% IF ( Koha.Preference('OPACTableColExpandedByDefault') ) %] >- var responsive_display = DataTable.Responsive.display.childRowImmediate; >- [% ELSE %] >- var responsive_display = DataTable.Responsive.display.childRow; >- [% END %] >- >+ var responsive_display = prefs.OPACTableColExpandedByDefault ? DataTable.Responsive.display.childRowImmediate : DataTable.Responsive.display.childRow; > $("#topissuest").kohaTable({ > order: [[3, "desc"]], > columnDefs: [{ className: "dtr-control", orderable: false, targets: -1 }], >-- >2.43.0 >
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 41569
:
191124
|
191125
|
191126
|
191572
|
191573
|
191574
|
191575
|
194643
|
194644
|
194649
|
194650
|
194651
|
194683
|
194684
|
194685
|
194686
|
194687
|
194688
| 195162