Bugzilla – Attachment 191375 Details for
Bug 41568
Tidy kohaTable block - circ
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 41568: Tidy kohaTable - circ/article-requests.tt
Bug-41568-Tidy-kohaTable---circarticle-requeststt.patch (text/plain), 4.69 KB, created by
Owen Leonard
on 2026-01-13 18:12:03 UTC
(
hide
)
Description:
Bug 41568: Tidy kohaTable - circ/article-requests.tt
Filename:
MIME Type:
Creator:
Owen Leonard
Created:
2026-01-13 18:12:03 UTC
Size:
4.69 KB
patch
obsolete
>From 7cb18bb67658d9878532f406208d07b4e247dc9a Mon Sep 17 00:00:00 2001 >From: Jonathan Druart <jonathan.druart@bugs.koha-community.org> >Date: Thu, 8 Jan 2026 11:56:51 +0100 >Subject: [PATCH] Bug 41568: Tidy kohaTable - circ/article-requests.tt > >Signed-off-by: Owen Leonard <oleonard@myacpl.org> >--- > .../prog/en/modules/circ/article-requests.tt | 21 ++++++++++++------- > 1 file changed, 13 insertions(+), 8 deletions(-) > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/article-requests.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/article-requests.tt >index cfb47daa5c4..44557dee841 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/article-requests.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/article-requests.tt >@@ -523,6 +523,15 @@ > > [% MACRO jsinclude BLOCK %] > [% INCLUDE 'datatables.inc' %] >+ <script> >+ let requested_table_settings = [% TablesSettings.GetTableSettings( 'circ', 'article-requests', 'article-requests-requested-table', 'json' ) | $raw %] >+ let pending_table_settings = [% TablesSettings.GetTableSettings( 'circ', 'article-requests', 'article-requests-pending-table', 'json' ) | $raw %] >+ let processing_table_settings = [% TablesSettings.GetTableSettings( 'circ', 'article-requests', 'article-requests-processing-table', 'json' ) | $raw %] >+ >+ const interface = "[% interface | html %]"; >+ const theme = "[% theme | html %]"; >+ </script> >+ > <script> > var active_tab = "#article-requests-requested_panel"; > var last_cancel_reason, requested_datatable, pending_datatable, processing_datatable, active_datatable, requested_dt, pending_dt, processing_dt; >@@ -575,10 +584,6 @@ > if( link.length > 0 ) link[0].focus(); > }); > >- let requested_table_settings = [% TablesSettings.GetTableSettings( 'circ', 'article-requests', 'article-requests-requested-table', 'json' ) | $raw %] >- let pending_table_settings = [% TablesSettings.GetTableSettings( 'circ', 'article-requests', 'article-requests-pending-table', 'json' ) | $raw %] >- let processing_table_settings = [% TablesSettings.GetTableSettings( 'circ', 'article-requests', 'article-requests-processing-table', 'json' ) | $raw %] >- > requested_datatable = $("#article-requests-requested-table").kohaTable({}, requested_table_settings); > requested_dt = requested_datatable.DataTable(); > >@@ -644,7 +649,7 @@ > table_row.find('input[type="checkbox"]').prop('checked', false); > > >- a.closest('td').prepend('<img src="[% interface | html %]/[% theme | html %]/img/spinner-small.gif"/>').find('div.dropdown').hide(); >+ a.closest('td').prepend('<img src="' + interface + '/' + theme + '/img/spinner-small.gif"/>').find('div.dropdown').hide(); > $.ajax({ > type: "DELETE", > url: '/api/v1/article_requests/'+id+query, >@@ -686,7 +691,7 @@ > var table = a.closest('table'); > var orig_dt = table.attr('id')==='article-requests-pending-table'?pending_dt:requested_dt; > >- a.closest('td').prepend('<img src="[% interface | html %]/[% theme | html %]/img/spinner-small.gif" class="spinner"/>').find('div.dropdown').hide(); >+ a.closest('td').prepend('<img src="' + interface + '/' + theme + '/img/spinner-small.gif" class="spinner"/>').find('div.dropdown').hide(); > > const client = APIClient.article_request; > await client.articleRequests.process(id).then( >@@ -716,7 +721,7 @@ > alert( _("Please fill URL before completing request.") ); > return; > } >- a.closest('td').prepend('<img src="[% interface | html %]/[% theme | html %]/img/spinner-small.gif"/>').find('div.dropdown').hide(); >+ a.closest('td').prepend('<img src="' + interface + '/' + theme + '/img/spinner-small.gif"/>').find('div.dropdown').hide(); > const client = APIClient.article_request; > await client.articleRequests.complete(id).then( > success => { >@@ -739,7 +744,7 @@ > var table_row = a.closest('tr'); > table_row.find('.ar-set-pending-request').remove(); > table_row.find('input[type="checkbox"]').prop('checked', false); >- a.closest('td').prepend('<img src="[% interface | html %]/[% theme | html %]/img/spinner-small.gif" class="spinner"/>').find('div.dropdown').hide(); >+ a.closest('td').prepend('<img src="' + interface + '/' + theme + '/img/spinner-small.gif" class="spinner"/>').find('div.dropdown').hide(); > const client = APIClient.article_request; > await client.articleRequests.pending(id).then( > success => { >-- >2.39.5
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 41568
:
191111
|
191112
|
191113
|
191114
|
191115
|
191116
|
191117
|
191118
|
191119
|
191120
|
191121
|
191122
|
191123
| 191375 |
191376
|
191377
|
191378
|
191379
|
191380
|
191381
|
191382
|
191383
|
191384
|
191385
|
191386
|
191387
|
191388