From d6ddf53ab69cf5f6e0e506b8a39ef782ec47869e Mon Sep 17 00:00:00 2001 From: Marcel de Rooy Date: Mon, 21 Sep 2020 11:29:18 +0000 Subject: [PATCH] Bug 26501: Add datatables to article-requests form Actually two tables: one for pending and processing. Variable active_table has been renamed to active_tab. To prevent a flickering form we hide stuff until ready. Test plan: [1] Submit a few article requests. [2] Verify that Process, Complete and Cancel still work via Actions. [3] Test again with multiselect and top Actions menu. [4] Test Search and Sort on the datatable. Signed-off-by: Marcel de Rooy Signed-off-by: Owen Leonard Signed-off-by: Katrin Fischer Signed-off-by: Jonathan Druart --- .../prog/en/modules/circ/article-requests.tt | 113 ++++++++---------- 1 file changed, 52 insertions(+), 61 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 2d7f508f06..d9bbbcb0c6 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 @@ -2,11 +2,13 @@ [% USE ItemTypes %] [% USE Branches %] [% USE AuthorisedValues %] +[% USE Asset %] +[% USE raw %] [% SET footerjs = 1 %] [% INCLUDE 'doc-head-open.inc' %] Koha › Circulation › Article requests [% INCLUDE 'doc-head-close.inc' %] - + [% BLOCK actions %] @@ -62,7 +64,7 @@ Article requests -
+
@@ -125,12 +127,6 @@ - - - There are no pending article requests at this time. - - - [% FOREACH ar IN article_requests_pending %] @@ -232,12 +228,6 @@ - - - There are no article requests in processing at this time. - - - [% FOREACH ar IN article_requests_processing %] @@ -320,43 +310,35 @@
[% MACRO jsinclude BLOCK %] + [% INCLUDE 'datatables.inc' %] [% END %] -- 2.39.5