gitea
/
Koha-clms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bug 41569: (follow-up) Fix conflict with 39698 

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
This commit is contained in:
Jonathan Druart 2026-03-12 11:29:03 +01:00 committed by Lucas Gass
parent 13d10ffd2d
commit 10ddff6f8d
No known key found for this signature in database
GPG Key ID: 60B447398B0D36CA
5 changed files with 31 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-authoritiessearchresultlist.tt
View File

@ -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 }],

14
koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-recalls.tt
View File

@ -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 }],

14
koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-search-history.tt
View File

@ -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,
},
},
});

10
koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-tags.tt
View File

@ -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: [

12
koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-topissues.tt
View File

@ -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 }],