Bugzilla – Attachment 189996 Details for
Bug 41324
Tidy kohaTable block
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 41324: Tidy modified files
ed04076.patch (text/plain), 19.66 KB, created by
Jonathan Druart
on 2025-11-27 14:32:15 UTC
(
hide
)
Description:
Bug 41324: Tidy modified files
Filename:
MIME Type:
Creator:
Jonathan Druart
Created:
2025-11-27 14:32:15 UTC
Size:
19.66 KB
patch
obsolete
>From ed04076df084768dff7a9f9b1318aa88810d177c Mon Sep 17 00:00:00 2001 >From: Jonathan Druart <jonathan.druart@bugs.koha-community.org> >Date: Thu, 27 Nov 2025 15:30:52 +0100 >Subject: [PATCH] Bug 41324: Tidy modified files > >Commit the tidiness > >perl misc/devel/tidy.pl $(git diff --name-only HEAD~1) >--- > .../prog/en/modules/acqui/acqui-home.tt | 92 +++++++------- > .../prog/en/modules/acqui/basket.tt | 115 +++++++++--------- > .../prog/en/modules/acqui/basketgroup.tt | 51 ++++---- > 3 files changed, 132 insertions(+), 126 deletions(-) > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tt >index 936d28c23f4..ce1aeb308a0 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tt >@@ -210,76 +210,74 @@ > <script> > var table_settings = [% TablesSettings.GetTableSettings( 'acqui', 'acq_acqui-home', 'accounts', 'json' ) | $raw %]; > </script> >- > <script> > dt_overwrite_html_sorting_localeCompare(); > >- $(document).ready(function() { >- var oTable = $("#accounts").kohaTable({ >- drawCallback: function ( oSettings ) { >- if ( oSettings.aiDisplay.length == 0 ) >- { >- return; >- } >+ $(document).ready(function () { >+ var oTable = $("#accounts").kohaTable( >+ { >+ drawCallback: function (oSettings) { >+ if (oSettings.aiDisplay.length == 0) { >+ return; >+ } > >- var nTrs = $('#accounts tbody tr'); >- var iColspan = nTrs[0].getElementsByTagName('td').length; >- var sLastGroup = ""; >- for ( var i=0 ; i<nTrs.length ; i++ ) >- { >- var iDisplayIndex = oSettings._iDisplayStart + i; >- var sGroup = oSettings.aoData[ oSettings.aiDisplay[iDisplayIndex] ]._aData[1]; >- if ( sGroup != sLastGroup ) >- { >- var nGroup = document.createElement( 'tr' ); >- var nCell = document.createElement( 'td' ); >- nCell.colSpan = iColspan; >- nCell.className = "group"; >- nCell.innerHTML = sGroup; >- nGroup.appendChild( nCell ); >- nTrs[i].parentNode.insertBefore( nGroup, nTrs[i] ); >- sLastGroup = sGroup; >+ var nTrs = $("#accounts tbody tr"); >+ var iColspan = nTrs[0].getElementsByTagName("td").length; >+ var sLastGroup = ""; >+ for (var i = 0; i < nTrs.length; i++) { >+ var iDisplayIndex = oSettings._iDisplayStart + i; >+ var sGroup = oSettings.aoData[oSettings.aiDisplay[iDisplayIndex]]._aData[1]; >+ if (sGroup != sLastGroup) { >+ var nGroup = document.createElement("tr"); >+ var nCell = document.createElement("td"); >+ nCell.colSpan = iColspan; >+ nCell.className = "group"; >+ nCell.innerHTML = sGroup; >+ nGroup.appendChild(nCell); >+ nTrs[i].parentNode.insertBefore(nGroup, nTrs[i]); >+ sLastGroup = sGroup; >+ } > } >- } >- }, >- footerCallback: function ( row, data, start, end, display ) { >- var api = this.api(), data; >- footer_column_sum( api, [ 6, 7, 8, 9 ] ); >+ }, >+ footerCallback: function (row, data, start, end, display) { >+ var api = this.api(), >+ data; >+ footer_column_sum(api, [6, 7, 8, 9]); >+ }, >+ columnDefs: [{ orderable: false, targets: ["_all"] }], >+ ordering: true, >+ orderFixed: [[1, "asc"]], >+ paging: false, >+ autoWidth: false, > }, >- columnDefs: [ >- { "orderable": false, "targets": ["_all"] } >- ], >- ordering: true, >- orderFixed: [[ 1, 'asc' ]], >- paging: false, >- autoWidth: false >- }, table_settings ); >+ table_settings >+ ); > let table_dt = oTable.DataTable(); > > $(oTable).treetable({ >- expandable: true >+ expandable: true, > }); >- $(oTable).treetable('expandAll'); >- $("#expand_all").click(function(e){ >+ $(oTable).treetable("expandAll"); >+ $("#expand_all").click(function (e) { > e.preventDefault(); >- $(oTable).treetable('expandAll'); >+ $(oTable).treetable("expandAll"); > }); >- $("#collapse_all").click(function(e){ >+ $("#collapse_all").click(function (e) { > e.preventDefault(); >- $(oTable).treetable('collapseAll'); >+ $(oTable).treetable("collapseAll"); > }); > >- $("#hide_inactive").click(function(e){ >+ $("#hide_inactive").click(function (e) { > e.preventDefault(); > table_dt.columns(0).search(1).draw(); // Show only active=1 > }); >- $("#show_inactive").click(function(e){ >+ $("#show_inactive").click(function (e) { > e.preventDefault(); > table_dt.columns(0).search("").draw(); > }); > $("#hide_inactive").click(); > >- $("#library-filter").change(function(){ >+ $("#library-filter").change(function () { > $("#accounts").DataTable().search(this.value); > $("#accounts").DataTable().draw(); > }); >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 81c11eb1981..70bf3e4c5fd 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt >@@ -1406,102 +1406,105 @@ > </script> > [% END # /UNLESS (closedate) %] > <script> >- var table_settings = [% TablesSettings.GetTableSettings( 'acqui', 'basket', 'orders', 'json' ) | $raw %]; >+ var table_settings = [% TablesSettings.GetTableSettings( 'acqui', 'basket', 'orders', 'json' ) | $raw %]; > >- 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 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 = 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 = 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 %]; >+ let skip_confirm_reopen = [% skip_confirm_reopen ? 1 : 0 %]; > </script> >- > <script> >- $(document).ready(function() { >- $("#orders").kohaTable({ >- bKohaColumnsUseNames: true, >- pagingType: "full", >- autoWidth: false, >- }, table_settings); >+ $(document).ready(function () { >+ $("#orders").kohaTable( >+ { >+ bKohaColumnsUseNames: true, >+ pagingType: "full", >+ autoWidth: false, >+ }, >+ table_settings >+ ); > > $("#cancelledorderst").kohaTable({ >- pagingType: "full" >+ pagingType: "full", > }); >- $("#reopenform").on("submit",function(e){ >+ $("#reopenform").on("submit", function (e) { > var is_confirmed = skip_confirm_reopen || confirm(_("Are you sure you want to reopen this basket?")); >- if( is_confirmed ){ return true; } >- else{ return false } >+ if (is_confirmed) { >+ return true; >+ } else { >+ return false; >+ } > }); > // Generates a dynamic link for exporting the selections data as CSV >- $("#exportbutton, #export-csv-menu a").click(function() { >+ $("#exportbutton, #export-csv-menu a").click(function () { > // Building the url from currently checked boxes >- var url = '/cgi-bin/koha/acqui/basket.pl'; >- url += $('#exportbutton').attr('href'); >- if($(this).attr("data-value")) { >- url += '&csv_profile=' + $(this).attr("data-value"); >+ var url = "/cgi-bin/koha/acqui/basket.pl"; >+ url += $("#exportbutton").attr("href"); >+ if ($(this).attr("data-value")) { >+ url += "&csv_profile=" + $(this).attr("data-value"); > } > // And redirecting to the CSV page > location.href = url; > return false; > }); >- $("#select_managing_library").on("change", function(){ >+ $("#select_managing_library").on("change", function () { > $(this).parent().submit(); > }); > >- $(".edit_delivery_date").on("click", function(e) { >+ $(".edit_delivery_date").on("click", function (e) { > e.preventDefault(); > var ordernumber = $(this).data("ordernumber"); > var order_number_text = _("(order number %s)").format(ordernumber); > var modalTitle = $(this).attr("title") + " " + order_number_text; >- var delivery_date = $( "#delivery_date_" + ordernumber ).data("delivery_date"); >+ var delivery_date = $("#delivery_date_" + ordernumber).data("delivery_date"); > const estimated_delivery_date = document.querySelector("#estimated_delivery_date")._flatpickr; >- estimated_delivery_date.setDate( delivery_date ); >+ estimated_delivery_date.setDate(delivery_date); > $("#dateEditor .modal-title").text(modalTitle); > $("#date_ordernumber").val(ordernumber); > $("#dateEditor").modal("show"); > }); > >- $("#dateEditor").on('hidden.bs.modal', function (e) { >+ $("#dateEditor").on("hidden.bs.modal", function (e) { > $("#dateEditorLabel").html(""); > $("#dateEditor .modal-title").text(""); >- $("#estimated_delivery_date").html( "" ); >+ $("#estimated_delivery_date").html(""); > $("#date_ordernumber").val(""); > }); > }); > > function add_user(borrowernumber, borrowername) { > var ids = $("#users_ids").val(); >- if(ids.length > 0) { >- ids = ids.split(':'); >+ if (ids.length > 0) { >+ ids = ids.split(":"); > } else { >- ids = new Array; >+ ids = new Array(); > } > if (ids.indexOf(borrowernumber.toString()) < 0) { > ids.push(borrowernumber); >- $("#users_ids").val(ids.join(':')); >- var li = '<li id="user_'+borrowernumber+'">'+borrowername >- + ' <a href="#" data-borrowernumber="'+borrowernumber+'" class="del_user"><i class="fa fa-trash-can"></i> ' >- + _("Delete user") + '</a></li>'; >+ $("#users_ids").val(ids.join(":")); >+ var li = '<li id="user_' + borrowernumber + '">' + borrowername + ' <a href="#" data-borrowernumber="' + borrowernumber + '" class="del_user"><i class="fa fa-trash-can"></i> ' + _("Delete user") + "</a></li>"; > $("#users_names").prepend(li); > $("#add_user_submit").show(); > return 0; >@@ -1510,10 +1513,10 @@ > } > > function del_user(borrowernumber) { >- $("#user_"+borrowernumber).remove(); >- var ids = $("#users_ids").val().split(':'); >+ $("#user_" + borrowernumber).remove(); >+ var ids = $("#users_ids").val().split(":"); > ids.splice(ids.indexOf(borrowernumber.toString()), 1); >- $("#users_ids").val(ids.join(':')); >+ $("#users_ids").val(ids.join(":")); > $("#add_user_submit").show(); > } > </script> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tt >index 3ed0223b055..1af2822f8bb 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tt >@@ -400,7 +400,6 @@ > let listclosed = [% listclosed ? 1 : 0 %]; > let grouping = [% grouping ? 1 : 0 %]; > </script> >- > <script> > function submitForm(form) { > if (form.closedbg.checked == true) { >@@ -413,24 +412,24 @@ > form.submit(); > } > >- function closeandprint(bg){ >- if(document.location = '/cgi-bin/koha/acqui/basketgroup.pl?op=closeandprint&basketgroupid=' + bg ){ >+ function closeandprint(bg) { >+ if ((document.location = "/cgi-bin/koha/acqui/basketgroup.pl?op=closeandprint&basketgroupid=" + bg)) { > setTimeout(() => { > window.location.reload(); > }, 3000); > } else { >- alert( _("Error downloading the file") ); >+ alert(_("Error downloading the file")); > } > } > >- $(document).ready(function() { >- if (listclosed){ >+ $(document).ready(function () { >+ if (listclosed) { > $("#basket_groups a[href='#closed']").tab("show"); > } else { > $("#basket_groups a[href='#opened']").tab("show"); > } > >- if (!grouping){ >+ if (!grouping) { > let dt_params = { > autoWidth: false, > pagingType: "full", >@@ -456,39 +455,45 @@ > }); > } > >- $("#basketgroupcolumns").on("click", ".addtogroup", function(){ >- const row = $("#" + $(this).data("basketid") ); >- if( row ){ >- $(this).removeClass("addtogroup").addClass("removefromgroup").html("<i class=\"fa fa-trash-can\" aria-hidden=\"true\"></i> " + _("Remove") ); >+ $("#basketgroupcolumns").on("click", ".addtogroup", function () { >+ const row = $("#" + $(this).data("basketid")); >+ if (row) { >+ $(this) >+ .removeClass("addtogroup") >+ .addClass("removefromgroup") >+ .html('<i class="fa fa-trash-can" aria-hidden="true"></i> ' + _("Remove")); > row.removeClass("ungrouped").addClass("grouped"); >- ungrouped.row( row ).remove().draw(); >- grouped.row.add( row ).draw(); >+ ungrouped.row(row).remove().draw(); >+ grouped.row.add(row).draw(); > } > }); > >- $("#basketgroupcolumns").on("click", ".removefromgroup", function(){ >- const row = $("#" + $(this).data("basketid") ); >- if( row ){ >- $(this).removeClass("removefromgroup").addClass("addtogroup").html("<i class=\"fa fa-plus\" aria-hidden=\"true\"></i> " + _("Add to group") ); >+ $("#basketgroupcolumns").on("click", ".removefromgroup", function () { >+ const row = $("#" + $(this).data("basketid")); >+ if (row) { >+ $(this) >+ .removeClass("removefromgroup") >+ .addClass("addtogroup") >+ .html('<i class="fa fa-plus" aria-hidden="true"></i> ' + _("Add to group")); > $(this).removeClass("").addClass(""); > row.removeClass("grouped").addClass("ungrouped"); >- grouped.row( row ).remove().draw(); >- ungrouped.row.add( row ).draw(); >+ grouped.row(row).remove().draw(); >+ ungrouped.row.add(row).draw(); > } > }); > >- $("#close_and_print").on("click", function(e){ >+ $("#close_and_print").on("click", function (e) { > e.preventDefault(); > const basketgroupid = $(this).data("basketgroupid"); >- closeandprint( basketgroupid ); >+ closeandprint(basketgroupid); > }); > >- $("#groupingform").on("submit", function(e){ >+ $("#groupingform").on("submit", function (e) { > e.preventDefault(); > submitForm(this); > }); > >- $("#delete_basketgroup").on("click", function(e){ >+ $("#delete_basketgroup").on("click", function (e) { > return confirm(_("Are you sure you want to delete this basket group?")); > }); > }); >-- >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 41324
:
189994
|
189995
| 189996