Bugzilla – Attachment 191070 Details for
Bug 41563
Tidy kohaTable block - acqui
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 41563: Tidy kohaTable - acqui/basket.tt
b5a2078.patch (text/plain), 4.20 KB, created by
Jonathan Druart
on 2026-01-09 14:40:00 UTC
(
hide
)
Description:
Bug 41563: Tidy kohaTable - acqui/basket.tt
Filename:
MIME Type:
Creator:
Jonathan Druart
Created:
2026-01-09 14:40:00 UTC
Size:
4.20 KB
patch
obsolete
>From b5a2078ce91eaa27baae14ed9f80522ddaf0c319 Mon Sep 17 00:00:00 2001 >From: Jonathan Druart <jonathan.druart@bugs.koha-community.org> >Date: Fri, 9 Jan 2026 14:28:30 +0100 >Subject: [PATCH] Bug 41563: Tidy kohaTable - acqui/basket.tt > >See bug 41324 comment 6 >1. Variable serialization >3. "table_settings" variable >--- > .../prog/en/modules/acqui/basket.tt | 56 ++++++++++--------- > 1 file changed, 29 insertions(+), 27 deletions(-) > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt >index bae154948a0..034d0ab57b2 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt >@@ -1406,46 +1406,48 @@ > </script> > [% END # /UNLESS (closedate) %] > <script> >- $(document).ready(function() { >- var table_settings = [% TablesSettings.GetTableSettings( 'acqui', 'basket', 'orders', 'json' ) | $raw %]; >+ var orders_table_settings = [% TablesSettings.GetTableSettings( 'acqui', 'basket', 'orders', 'json' ) | $raw %]; >+ let supplier_report_column = orders_table_settings.columns.find(c => c.columnname == 'supplier_report'); >+ [% IF !(Koha.Preference('EDIFACT') && ediaccount) %] >+ supplier_report_column.is_hidden = 1; >+ supplier_report_column.cannot_be_toggled = 1; >+ [% ELSE %] >+ supplier_report_column.is_hidden = 0; >+ [% END %] >+ supplier_report_column.force_visibility = 1; > >- let supplier_report_column = table_settings.columns.find(c => c.columnname == 'supplier_report'); >- [% IF !(Koha.Preference('EDIFACT') && ediaccount) %] >- supplier_report_column.is_hidden = 1; >- supplier_report_column.cannot_be_toggled = 1; >- [% ELSE %] >- supplier_report_column.is_hidden = 0; >- [% END %] >- supplier_report_column.force_visibility = 1; >+ let modify_column = orders_table_settings.columns.find(c => c.columnname == 'modify'); >+ [% IF ( active && !closedate ) %] >+ modify_column.is_hidden = 0; >+ [% ELSE %] >+ modify_column.is_hidden = 1; >+ [% END %] >+ modify_column.force_visibility = 1; > >- let modify_column = table_settings.columns.find(c => c.columnname == 'modify'); >- [% IF ( active && !closedate ) %] >- modify_column.is_hidden = 0; >- [% ELSE %] >- modify_column.is_hidden = 1; >- [% END %] >- modify_column.force_visibility = 1; >+ let cancel_column = orders_table_settings.columns.find(c => c.columnname == 'cancel'); >+ [% IF !closedate || Koha.Preference('CancelOrdersInClosedBaskets') %] >+ cancel_column.is_hidden = 0; >+ [% ELSE %] >+ cancel_column.is_hidden = 1; >+ [% END %] >+ cancel_column.force_visibility = 1; > >- let cancel_column = table_settings.columns.find(c => c.columnname == 'cancel'); >- [% IF !closedate || Koha.Preference('CancelOrdersInClosedBaskets') %] >- cancel_column.is_hidden = 0; >- [% ELSE %] >- cancel_column.is_hidden = 1; >- [% END %] >- cancel_column.force_visibility = 1; >+ let skip_confirm_reopen = [% skip_confirm_reopen ? 1 : 0 | html %]; >+ </script> > >+ <script> >+ $(document).ready(function() { > $("#orders").kohaTable({ > bKohaColumnsUseNames: true, > pagingType: "full", > autoWidth: false, >- }, table_settings); >+ }, orders_table_settings); > > $("#cancelledorderst").kohaTable({ > pagingType: "full" > }); > $("#reopenform").on("submit",function(e){ >- var skip = [% IF ( skip_confirm_reopen ) %] 1 [% ELSE %] 0 [% END %]; >- var is_confirmed = skip || confirm(_("Are you sure you want to reopen this basket?")); >+ var is_confirmed = skip_confirm_reopen || confirm(_("Are you sure you want to reopen this basket?")); > if( is_confirmed ){ return true; } > else{ return false } > }); >-- >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 41563
:
191069
|
191070
|
191071
|
191072
|
191073
|
191074
|
191075
|
191076
|
191077
|
191078
|
191079
|
191080
|
191290
|
191291
|
191292
|
191293
|
191294
|
191295
|
191296
|
191297
|
191298
|
191299
|
191300
|
191301
|
191302
|
191303