From 3600c7a04e5afdf21d0a7d805954a41e12cf2d9e Mon Sep 17 00:00:00 2001 From: Kyle M Hall Date: Mon, 13 Apr 2015 11:23:20 -0400 Subject: [PATCH] [v3.18.x] 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 Bug 13986 - Implement fix for OPAC Tested wit OPAC, full list is printed. Signed-off-by: Marc Veron Signed-off-by: Katrin Fischer --- C4/VirtualShelves/Page.pm | 16 ++++++++++------ koha-tmpl/intranet-tmpl/prog/en/css/print.css | 2 +- .../prog/en/includes/virtualshelves-toolbar.inc | 6 +----- .../prog/en/modules/virtualshelves/shelves.tt | 14 ++++++++++++-- .../opac-tmpl/bootstrap/en/modules/opac-shelves.tt | 13 +++++++++---- opac/opac-shelves.pl | 6 +++++- virtualshelves/shelves.pl | 1 + 7 files changed, 39 insertions(+), 19 deletions(-) diff --git a/C4/VirtualShelves/Page.pm b/C4/VirtualShelves/Page.pm index baf790f..d91e96d 100644 --- a/C4/VirtualShelves/Page.pm +++ b/C4/VirtualShelves/Page.pm @@ -83,12 +83,15 @@ sub shelfpage { @cart_list = split(/\//, $cart_list); } - $shelflimit = ( $type eq 'opac' ? C4::Context->preference('OPACnumSearchResults') : C4::Context->preference('numSearchResults') ); - $shelflimit = $shelflimit || ShelvesMax('MGRPAGE'); - $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 + # getting the Shelves list + unless ( $query->param('print') ) { + $shelflimit = ( $type eq 'opac' ? C4::Context->preference('OPACnumSearchResults') : C4::Context->preference('numSearchResults') ); + $shelflimit = $shelflimit || ShelvesMax('MGRPAGE'); + $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) + } + my $category = ( ( $displaymode eq 'privateshelves' ) ? 1 : 2 ); my ( $shelflist, $totshelves ) = GetShelves( $category, $shelveslimit, $shelvesoffset, $loggedinuser ); @@ -464,6 +467,7 @@ sub shelfpage { $template->param( 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 239059c..e0e346e 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 4de9e19..1e00cc4 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 @@
Send list
-
Print list
+
Print list
[% 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 97e47a7..44df96a 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt @@ -1,6 +1,16 @@ [% INCLUDE 'doc-head-open.inc' %] Koha › [% IF ( viewshelf ) %]Lists › Contents of [% shelfname | html %][% ELSE %]Lists[% END %][% IF ( shelves ) %] › Create new list[% END %][% IF ( edit ) %] › Edit list [% shelfname | html %][% END %] [% INCLUDE 'doc-head-close.inc' %] + +[% IF print %] + +[% END %] + [% IF ( viewshelf ) %] @@ -282,7 +292,7 @@ function placeHold () { [% SET new_direction = 'asc' %] [% END %] -
+
[% IF ( itemsloop ) %]
| @@ -402,7 +412,7 @@ function placeHold () { [% IF ( allowaddingitem ) %]
-
+
Add an item to [% shelfname | html %]
  1. diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shelves.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shelves.tt index a7f982b..f3c0099 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shelves.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shelves.tt @@ -43,7 +43,7 @@ [% INCLUDE 'masthead.inc' %]
    -
      +
      • Home ›
        • [% IF ( loggedinusername ) %]
      • [% FOREACH USER_INF IN USER_INFO %][% USER_INF.title %] [% USER_INF.firstname %] [% USER_INF.surname %][% END %] ›
        • @@ -91,7 +91,7 @@
        - [% IF ( OpacNav||loggedinusername ) %] + [% IF ( OpacNav||loggedinusername ) && !print %]
        -
        +
        | Select titles to: @@ -1017,6 +1017,11 @@ $(function() { [% IF OPACLocalCoverImages %]KOHA.LocalCover.GetCoverFromBibnumber(false);[% END %] [% IF ( GoogleJackets ) %]KOHA.Google.GetCoverFromIsbn();[% END %] $('#sort-submit').hide(); + + [% IF print %] + window.print(); + setTimeout('window.close()', 1); + [% END %] }); // document.ready function Check(f) { diff --git a/opac/opac-shelves.pl b/opac/opac-shelves.pl index 0f1e5c5..62bace1 100755 --- a/opac/opac-shelves.pl +++ b/opac/opac-shelves.pl @@ -31,6 +31,10 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user({ type => "opac", authnotrequired => ( C4::Context->preference("OpacPublic") ? 1 : 0 ), }); -$template->param(listsview => 1); + +$template->param( + listsview => 1, + print => $query->param('print') +); shelfpage('opac', $query, $template, $loggedinuser, $cookie); diff --git a/virtualshelves/shelves.pl b/virtualshelves/shelves.pl index 52789ea..11f828c 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); -- 1.7.2.5