From 9495ecaab6777bdd0e92aa0239b9c9cb5759e3e9 Mon Sep 17 00:00:00 2001 From: Kyle M Hall Date: Mon, 13 Apr 2015 11:23:20 -0400 Subject: [PATCH] Bug 13986: Printing a list only prints the results of the page you are viewing The print list button only prints the page you are viewing, and not the entire list. Test Plan: 1) Apply this patch 2) Create a list with enough items that it will paginate 3) Browse to that list, click the 'print list' button 4) Note the entire list prints, not just the visible items Tested in staff client, works as expected. It would be great to have the same for OPAC as well (OPAC still prints first page only). Signed-off-by: Marc Veron Signed-off-by: Katrin Fischer Signed-off-by: Tomas Cohen Arazi --- C4/VirtualShelves/Page.pm | 15 +++++++++------ koha-tmpl/intranet-tmpl/prog/en/css/print.css | 2 +- .../prog/en/includes/virtualshelves-toolbar.inc | 6 +----- .../prog/en/modules/virtualshelves/shelves.tt | 14 ++++++++++++-- virtualshelves/shelves.pl | 1 + 5 files changed, 24 insertions(+), 14 deletions(-) diff --git a/C4/VirtualShelves/Page.pm b/C4/VirtualShelves/Page.pm index beed3e290b..f4f09d7007 100644 --- a/C4/VirtualShelves/Page.pm +++ b/C4/VirtualShelves/Page.pm @@ -76,12 +76,14 @@ sub shelfpage { my ( $shelflimit, $shelfoffset, $shelveslimit, $shelvesoffset ); my $marcflavour = C4::Context->preference("marcflavour"); - $shelflimit = ( $type eq 'opac' ? C4::Context->preference('OPACnumSearchResults') : C4::Context->preference('numSearchResults') ); - $shelflimit = $shelflimit || ShelvesMax('MGRPAGE'); - $shelflimit = undef if $query->param('rss'); - $shelfoffset = ( $itemoff - 1 ) * $shelflimit; # Sets the offset to begin retrieving items at - $shelveslimit = $shelflimit; # Limits number of shelves returned for a given query (row_count) - $shelvesoffset = ( $shelfoff - 1 ) * $shelflimit; # Sets the offset to begin retrieving shelves at (offset) + unless ( $query->param('print') ) { + $shelflimit = ( $type eq 'opac' ? C4::Context->preference('OPACnumSearchResults') : C4::Context->preference('numSearchResults') ); + $shelflimit = $shelflimit || ShelvesMax('MGRPAGE'); + $shelflimit = undef if $query->param('rss'); + $shelfoffset = ( $itemoff - 1 ) * $shelflimit; # Sets the offset to begin retrieving items at + $shelveslimit = $shelflimit; # Limits number of shelves returned for a given query (row_count) + $shelvesoffset = ( $shelfoff - 1 ) * $shelflimit; # Sets the offset to begin retrieving shelves at (offset) + } # getting the Shelves list my $category = ( ( $displaymode eq 'privateshelves' ) ? 1 : 2 ); @@ -469,6 +471,7 @@ sub shelfpage { pagination_bar => pagination_bar( $url, ( int( $totshelves / $shelveslimit ) ) + ( ( $totshelves % $shelveslimit ) > 0 ? 1 : 0 ), $shelfoff, "shelfoff" ) ); } } + $template->param( shelveslooppriv => \@shelveslooppriv, shelvesloop => \@shelvesloop, diff --git a/koha-tmpl/intranet-tmpl/prog/en/css/print.css b/koha-tmpl/intranet-tmpl/prog/en/css/print.css index 239059c75b..e0e346e1b6 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/css/print.css +++ b/koha-tmpl/intranet-tmpl/prog/en/css/print.css @@ -322,4 +322,4 @@ fieldset { } #cataloguing_additem_itemlist { overflow : visible !important; -} \ No newline at end of file +} diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/virtualshelves-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/virtualshelves-toolbar.inc index 4de9e1936b..1e00cc49cb 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/virtualshelves-toolbar.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/virtualshelves-toolbar.inc @@ -12,10 +12,6 @@ sendList(); return false; }); - $("#printlist").click(function(){ - print(); - return false; - }); $("#deleteshelf").click(function(e){ if(confirmDelete(_("Are you sure you want to delete this list?"))){ return true; @@ -60,6 +56,6 @@ - + [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt index 0f479a5454..30bd1247dd 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt @@ -4,6 +4,16 @@ [% INCLUDE 'datatables.inc' %] + +[% IF print %] + +[% END %] + [% IF ( viewshelf ) %] @@ -356,7 +366,7 @@ function placeHold () { [% SET new_direction = 'asc' %] [% END %] -
+
[% IF ( itemsloop ) %]
| @@ -476,7 +486,7 @@ function placeHold () { [% IF ( allowaddingitem ) %]
-
+
Add an item to [% shelfname | html %]
  1. diff --git a/virtualshelves/shelves.pl b/virtualshelves/shelves.pl index 4e224fcef4..43ae72a11b 100755 --- a/virtualshelves/shelves.pl +++ b/virtualshelves/shelves.pl @@ -35,4 +35,5 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user( flagsrequired => { catalogue => 1 }, } ); +$template->param( print => $query->param('print') ); shelfpage('intranet', $query, $template, $loggedinuser, $cookie); -- 2.39.5