From 4a87ff87035a60d39ef5c822ddad48626efcd5df Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Wed, 15 Sep 2021 12:14:19 +0000 Subject: [PATCH] Bug 29015: (follow-up) Show sidebar filter form with results This patch adds the new filter form in the sidebar when showing results. To do so the form markup is moved into a BLOCK so that it can be reused. This patch also adds pre-selection of submitted options on the filter form so that it reflects the user's choices. To test, apply the patch and rebuild the staff client CSS (https://wiki.koha-community.org/wiki/Working_with_SCSS_in_the_OPAC_and_staff_client). - Go to Circulation -> Holds queue. - Submit the form with one or more filters selected. - On the results page the queue should be correctly filtered and the sidebar should show your search fields preselected. - Test with the CircSidebar preference enabled and disabled. The circulation menu should appear correctly, with the filter form only displaying in the sidebar after submitting the form. Signed-off-by: Nick Clemens Signed-off-by: Katrin Fischer Signed-off-by: Jonathan Druart --- .../prog/css/src/staff-global.scss | 5 + .../prog/en/modules/circ/view_holdsqueue.tt | 106 ++++++++++-------- 2 files changed, 66 insertions(+), 45 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss b/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss index df2354cad2..270bb58722 100644 --- a/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss +++ b/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss @@ -228,6 +228,11 @@ aside { margin-right: 3px; width: calc(100% - 20px); } + + &+.action { + margin-left: 0; + padding: 0; + } } } } diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/view_holdsqueue.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/view_holdsqueue.tt index 6c9e5ffea1..630b58ad4b 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/view_holdsqueue.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/view_holdsqueue.tt @@ -53,7 +53,7 @@
- [% IF Koha.Preference('CircSidebar') %] + [% IF ( total || Koha.Preference('CircSidebar') ) %]
[% ELSE %]
@@ -202,58 +202,74 @@ [% END %] [% END %] -[% UNLESS ( total ) %] -
-
-
    -
  1. - - -
  2. -
  3. - - -
  4. -
  5. - - -
  6. -
  7. - - -
  8. -
-
-
-
-[% END %] + [% UNLESS ( total ) %] + [% PROCESS filter_form %] + [% END %] - [% IF Koha.Preference('CircSidebar') %] -
-
-
+ [% IF ( total || Koha.Preference('CircSidebar') ) %] +
+ -
-
+ [% END %] + +
[% END %] +
+[% BLOCK filter_form %] +
+ [% IF ( total ) %] +
+ [% ELSE -%] +
+ [% END %] +
    +
  1. + + +
  2. +
  3. + + +
  4. +
  5. + + +
  6. +
  7. + + +
  8. +
+
+
+ + +
+ +[% END %] + [% MACRO jsinclude BLOCK %] [% INCLUDE 'datatables.inc' %] [% INCLUDE 'columns_settings.inc' %] -- 2.39.5