From 436f4b9e0eb19eea491ecc70a2a996a8297f3d33 Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Fri, 1 Jun 2018 16:28:29 +0000 Subject: [PATCH] Bug 20468: (follow-up) Changes to checkbox/menu interactions This patch makes a couple of minor interface changes and updates the way checkbox change events are handled: - jQueryUI tabs initialization sets a variable for "active table" which can be re-used by functions which affect only the visible table. - The batch "Actions" menu is shown or hidden based on whether there are checked items. - The item selection tools are shown or hidden based on whether there are rows in the table. To test, apply the patch and test various article request actions: - Single "process," "complete," and "cancel" operations. - Select all/ clear all operations on both tabs. - Batch operations with checked requests. - Process all pending requests to confirm the selection controls for that table are hidden. - Complete all processing requests to confirm the selection controls for that table are hidden. Signed-off-by: Marcel de Rooy Signed-off-by: Jonathan Druart Signed-off-by: Nick Clemens --- .../prog/en/modules/circ/article-requests.tt | 89 +++++++++++++------ 1 file changed, 61 insertions(+), 28 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 f9835454d8..fddd9fe7cc 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 @@ -6,10 +6,11 @@ [% INCLUDE 'doc-head-open.inc' %] Koha › Circulation › Article requests [% INCLUDE 'doc-head-close.inc' %] - + [% BLOCK actions %] + [% END %] @@ -91,6 +93,11 @@
+
+ Select all | Clear all + [% PROCESS actions menuid='article-menu-pending' id_arg=0 pull_right='' aria_menu='table_controls' %] +
+ @@ -185,7 +192,7 @@ @@ -195,6 +202,10 @@
+
+ Select all | Clear all + [% PROCESS actions menuid='article-menu-processing' id_arg=0 pull_right='' aria_menu='table_controls' %] +
[% ar.created_on | $KohaDates %]
- [% PROCESS actions id_arg=ar.id pull_right='pull-right' aria_menu='ar-actions' %] + [% PROCESS actions menuid = "row" _ ar.id id_arg=ar.id pull_right='pull-right' aria_menu='ar-actions' %]
@@ -289,7 +300,7 @@ @@ -298,19 +309,25 @@
[% ar.created_on | $KohaDates %]
- [% PROCESS actions id_arg=ar.id pull_right='pull-right' aria_menu='ar-actions' %] + [% PROCESS actions menuid="table_" _ ar.id id_arg=ar.id pull_right='pull-right' aria_menu='ar-actions' %]

-
- Select all Clear all - [% PROCESS actions id_arg=0 pull_right='' aria_menu='table_controls' %] -
[% MACRO jsinclude BLOCK %] -