View | Details | Raw Unified | Return to bug 5524
Collapse All | Expand All

(-)a/C4/VirtualShelves/Page.pm (-1 / +1 lines)
Lines 62-67 sub shelfpage ($$$$$) { Link Here
62
    my @paramsloop;
62
    my @paramsloop;
63
    my $totitems;
63
    my $totitems;
64
    my $shelfoff    = ( $query->param('shelfoff') ? $query->param('shelfoff') : 1 );
64
    my $shelfoff    = ( $query->param('shelfoff') ? $query->param('shelfoff') : 1 );
65
    $template->{VARS}->{'shelfoff'} = $shelfoff;
65
    my $itemoff     = ( $query->param('itemoff')  ? $query->param('itemoff')  : 1 );
66
    my $itemoff     = ( $query->param('itemoff')  ? $query->param('itemoff')  : 1 );
66
    my $displaymode = ( $query->param('display')  ? $query->param('display')  : 'publicshelves' );
67
    my $displaymode = ( $query->param('display')  ? $query->param('display')  : 'publicshelves' );
67
    my ( $shelflimit, $shelfoffset, $shelveslimit, $shelvesoffset );
68
    my ( $shelflimit, $shelfoffset, $shelveslimit, $shelvesoffset );
Lines 88-94 sub shelfpage ($$$$$) { Link Here
88
89
89
    # the format of this is unindented for ease of diff comparison to the old script
90
    # the format of this is unindented for ease of diff comparison to the old script
90
    # Note: do not mistake the assignment statements below for comparisons!
91
    # Note: do not mistake the assignment statements below for comparisons!
91
92
    if ( $query->param('modifyshelfcontents') ) {
92
    if ( $query->param('modifyshelfcontents') ) {
93
        my ( $shelfnumber, $barcode, $item, $biblio );
93
        my ( $shelfnumber, $barcode, $item, $biblio );
94
        if ( $shelfnumber = $query->param('viewshelf') ) {
94
        if ( $shelfnumber = $query->param('viewshelf') ) {
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt (-2 / +4 lines)
Lines 24-30 $(document).ready(function(){ Link Here
24
24
25
	function confirmDelete(message){
25
	function confirmDelete(message){
26
		if (window.confirm(message)) {
26
		if (window.confirm(message)) {
27
			location.href="/cgi-bin/koha/virtualshelves/shelves.pl?[% IF ( showprivateshelves ) %]display=privateshelves&[% END %]shelves=1&DEL-[% shelfnumber %]=1";
27
		    location.href="/cgi-bin/koha/virtualshelves/shelves.pl?[% IF ( showprivateshelves ) %] display=privateshelves&[% END %]shelves=1&DEL-[% shelfnumber %]=1&shelfoff=[% shelfoff %]";
28
		} else { 
28
		} else { 
29
			return false;
29
			return false;
30
		}
30
		}
Lines 349-355 function placeHold () { Link Here
349
        		<tr><th>List Name</th><th>Contents</th><th>Sort by</th><th>Type</th><th>Options</th></tr>
349
        		<tr><th>List Name</th><th>Contents</th><th>Sort by</th><th>Type</th><th>Options</th></tr>
350
                [% FOREACH shelveslooppri IN shelveslooppriv %]
350
                [% FOREACH shelveslooppri IN shelveslooppriv %]
351
                    [% IF ( shelveslooppri.toggle ) %]<tr class="highlight">[% ELSE %]<tr>[% END %]
351
                    [% IF ( shelveslooppri.toggle ) %]<tr class="highlight">[% ELSE %]<tr>[% END %]
352
        <td><a href="shelves.pl?[% IF ( shelveslooppri.showprivateshelves ) %]display=privateshelves&amp;[% END %]viewshelf=[% shelveslooppri.shelf %]">[% shelveslooppri.shelfname |html %]</a></td>
352
        <td><a href="shelves.pl?[% IF ( shelveslooppri.showprivateshelves ) %]display=privateshelves&amp;[% END %]viewshelf=[% shelveslooppri.shelf %]&shelfoff=[% shelfoff %]">[% shelveslooppri.shelfname |html %]</a></td>
353
        <td>[% shelveslooppri.count %] item(s)</td>
353
        <td>[% shelveslooppri.count %] item(s)</td>
354
        <td>[% IF ( shelveslooppri.authorsort ) %]Author[% ELSIF ( shelveslooppri.yearsort ) %]Year[% ELSE %]Title[% END %]</td>
354
        <td>[% IF ( shelveslooppri.authorsort ) %]Author[% ELSIF ( shelveslooppri.yearsort ) %]Year[% ELSE %]Title[% END %]</td>
355
        <td>[% IF ( shelveslooppri.viewcategory1 ) %]Private[% END %]
355
        <td>[% IF ( shelveslooppri.viewcategory1 ) %]Private[% END %]
Lines 368-373 function placeHold () { Link Here
368
					<input type="submit" class="editshelf" value="Edit" />
368
					<input type="submit" class="editshelf" value="Edit" />
369
				</form>
369
				</form>
370
				<form action="shelves.pl" method="post">
370
				<form action="shelves.pl" method="post">
371
				    <input type="hidden" name="shelfoff" value="[% shelfoff %]" />
371
					<input type="hidden" name="shelves" value="1" />
372
					<input type="hidden" name="shelves" value="1" />
372
                    <input type="hidden" name="display" value="privateshelves" />
373
                    <input type="hidden" name="display" value="privateshelves" />
373
					<input type="hidden" name="DEL-[% shelveslooppri.shelf %]" value="1" />
374
					<input type="hidden" name="DEL-[% shelveslooppri.shelf %]" value="1" />
Lines 416-421 function placeHold () { Link Here
416
					<input type="submit" class="editshelf" value="Edit" />
417
					<input type="submit" class="editshelf" value="Edit" />
417
				</form>
418
				</form>
418
				<form action="shelves.pl" method="post">
419
				<form action="shelves.pl" method="post">
420
				        <input type="hidden" name="shelfoff" value="[% shelfoff %]" />
419
					<input type="hidden" name="shelves" value="1" />
421
					<input type="hidden" name="shelves" value="1" />
420
					<input type="hidden" name="DEL-[% shelvesloo.shelf %]" value="1" />
422
					<input type="hidden" name="DEL-[% shelvesloo.shelf %]" value="1" />
421
					[% IF ( shelvesloo.confirm ) %]
423
					[% IF ( shelvesloo.confirm ) %]
(-)a/koha-tmpl/opac-tmpl/prog/en/modules/opac-shelves.tt (-1 / +2 lines)
Lines 367-372 $(function() { Link Here
367
                <form method="post" action="opac-shelves.pl">
367
                <form method="post" action="opac-shelves.pl">
368
                  <input type="hidden" name="DEL-[% shelfnumber %]" value="1" />
368
                  <input type="hidden" name="DEL-[% shelfnumber %]" value="1" />
369
                  <input type="hidden" name="shelves" value="1" />
369
                  <input type="hidden" name="shelves" value="1" />
370
		  <input type="hidden" name="shelfoff" value="[% shelfoff %]" />
370
                  <input type="submit" class="icon delete" value="Delete this List" onclick="return confirmDelete(MSG_CONFIRM_DELETE_LIST)" />
371
                  <input type="submit" class="icon delete" value="Delete this List" onclick="return confirmDelete(MSG_CONFIRM_DELETE_LIST)" />
371
              [% END %]
372
              [% END %]
372
            [% END %]
373
            [% END %]
Lines 463-468 $(function() { Link Here
463
                                  <input type="hidden" name="shelves" value="1" />
464
                                  <input type="hidden" name="shelves" value="1" />
464
                                  <input type="hidden" name="display" value="privateshelves" />
465
                                  <input type="hidden" name="display" value="privateshelves" />
465
                                  <input type="hidden" name="DEL-[% shelveslooppri.shelf %]" value="1" />
466
                                  <input type="hidden" name="DEL-[% shelveslooppri.shelf %]" value="1" />
467
				  <input type="hidden" name="shelfoff" value="[% shelfoff %]" />
466
                              [% IF ( shelveslooppri.confirm ) %]
468
                              [% IF ( shelveslooppri.confirm ) %]
467
                                    <input type="hidden" name="CONFIRM-[% shelveslooppri.confirm %]" value="1" />
469
                                    <input type="hidden" name="CONFIRM-[% shelveslooppri.confirm %]" value="1" />
468
                                    <input type="submit" class="confirm" value="Confirm" />
470
                                    <input type="submit" class="confirm" value="Confirm" />
469
- 

Return to bug 5524