From: Chris Cormack <[email protected]> Includes follow up fixing deleting lists in OPAC
Signed-off-by: Owen Leonard <[email protected]> --- C4/VirtualShelves/Page.pm | 2 +- .../prog/en/modules/virtualshelves/shelves.tt | 6 ++++-- .../opac-tmpl/prog/en/modules/opac-shelves.tt | 2 ++ 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/C4/VirtualShelves/Page.pm b/C4/VirtualShelves/Page.pm index 73a590d..161a7aa 100644 --- a/C4/VirtualShelves/Page.pm +++ b/C4/VirtualShelves/Page.pm @@ -62,6 +62,7 @@ sub shelfpage ($$$$$) { my @paramsloop; my $totitems; my $shelfoff = ( $query->param('shelfoff') ? $query->param('shelfoff') : 1 ); + $template->{VARS}->{'shelfoff'} = $shelfoff; my $itemoff = ( $query->param('itemoff') ? $query->param('itemoff') : 1 ); my $displaymode = ( $query->param('display') ? $query->param('display') : 'publicshelves' ); my ( $shelflimit, $shelfoffset, $shelveslimit, $shelvesoffset ); @@ -88,7 +89,6 @@ sub shelfpage ($$$$$) { # the format of this is unindented for ease of diff comparison to the old script # Note: do not mistake the assignment statements below for comparisons! - if ( $query->param('modifyshelfcontents') ) { my ( $shelfnumber, $barcode, $item, $biblio ); if ( $shelfnumber = $query->param('viewshelf') ) { 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 d275d56..d7a34a1 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt @@ -24,7 +24,7 @@ $(document).ready(function(){ function confirmDelete(message){ if (window.confirm(message)) { - location.href="/cgi-bin/koha/virtualshelves/shelves.pl?[% IF ( showprivateshelves ) %]display=privateshelves&[% END %]shelves=1&DEL-[% shelfnumber %]=1"; + location.href="/cgi-bin/koha/virtualshelves/shelves.pl?[% IF ( showprivateshelves ) %] display=privateshelves&[% END %]shelves=1&DEL-[% shelfnumber %]=1&shelfoff=[% shelfoff %]"; } else { return false; } @@ -349,7 +349,7 @@ function placeHold () { <tr><th>List Name</th><th>Contents</th><th>Sort by</th><th>Type</th><th>Options</th></tr> [% FOREACH shelveslooppri IN shelveslooppriv %] [% IF ( shelveslooppri.toggle ) %]<tr class="highlight">[% ELSE %]<tr>[% END %] - <td><a href="shelves.pl?[% IF ( shelveslooppri.showprivateshelves ) %]display=privateshelves&[% END %]viewshelf=[% shelveslooppri.shelf %]">[% shelveslooppri.shelfname |html %]</a></td> + <td><a href="shelves.pl?[% IF ( shelveslooppri.showprivateshelves ) %]display=privateshelves&[% END %]viewshelf=[% shelveslooppri.shelf %]&shelfoff=[% shelfoff %]">[% shelveslooppri.shelfname |html %]</a></td> <td>[% shelveslooppri.count %] item(s)</td> <td>[% IF ( shelveslooppri.authorsort ) %]Author[% ELSIF ( shelveslooppri.yearsort ) %]Year[% ELSE %]Title[% END %]</td> <td>[% IF ( shelveslooppri.viewcategory1 ) %]Private[% END %] @@ -368,6 +368,7 @@ function placeHold () { <input type="submit" class="editshelf" value="Edit" /> </form> <form action="shelves.pl" method="post"> + <input type="hidden" name="shelfoff" value="[% shelfoff %]" /> <input type="hidden" name="shelves" value="1" /> <input type="hidden" name="display" value="privateshelves" /> <input type="hidden" name="DEL-[% shelveslooppri.shelf %]" value="1" /> @@ -416,6 +417,7 @@ function placeHold () { <input type="submit" class="editshelf" value="Edit" /> </form> <form action="shelves.pl" method="post"> + <input type="hidden" name="shelfoff" value="[% shelfoff %]" /> <input type="hidden" name="shelves" value="1" /> <input type="hidden" name="DEL-[% shelvesloo.shelf %]" value="1" /> [% IF ( shelvesloo.confirm ) %] diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-shelves.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-shelves.tt index 9220367..344f822 100644 --- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-shelves.tt +++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-shelves.tt @@ -367,6 +367,7 @@ $(function() { <form method="post" action="opac-shelves.pl"> <input type="hidden" name="DEL-[% shelfnumber %]" value="1" /> <input type="hidden" name="shelves" value="1" /> + <input type="hidden" name="shelfoff" value="[% shelfoff %]" /> <input type="submit" class="icon delete" value="Delete this List" onclick="return confirmDelete(MSG_CONFIRM_DELETE_LIST)" /> [% END %] [% END %] @@ -463,6 +464,7 @@ $(function() { <input type="hidden" name="shelves" value="1" /> <input type="hidden" name="display" value="privateshelves" /> <input type="hidden" name="DEL-[% shelveslooppri.shelf %]" value="1" /> + <input type="hidden" name="shelfoff" value="[% shelfoff %]" /> [% IF ( shelveslooppri.confirm ) %] <input type="hidden" name="CONFIRM-[% shelveslooppri.confirm %]" value="1" /> <input type="submit" class="confirm" value="Confirm" /> -- 1.7.3 _______________________________________________ Koha-patches mailing list [email protected] http://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-patches website : http://www.koha-community.org/ git : http://git.koha-community.org/ bugs : http://bugs.koha-community.org/
