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

(-)a/circ/waitingreserves.pl (-1 / +23 lines)
Lines 48-53 my $fbr = $input->param('fbr') || ''; Link Here
48
my $tbr            = $input->param('tbr') || '';
48
my $tbr            = $input->param('tbr') || '';
49
my $all_branches   = $input->param('allbranches') || '';
49
my $all_branches   = $input->param('allbranches') || '';
50
my $cancelall      = $input->param('cancelall');
50
my $cancelall      = $input->param('cancelall');
51
my $deskcode       = $input->param('deskcode') || '';
51
52
52
my $cancel;
53
my $cancel;
53
54
Lines 64-69 my ( $template, $loggedinuser, $cookie ) = get_template_and_user( Link Here
64
65
65
my $default = C4::Context->userenv->{'branch'};
66
my $default = C4::Context->userenv->{'branch'};
66
67
68
my @deskloop;
69
my $desksaref = GetDesks($default);
70
foreach my $d (@$desksaref) {
71
    my $deskh = GetDesk($d);
72
    unless ($deskcode) {
73
	$deskh->{'selected'} = 1
74
	    if ($deskh->{'deskcode'} eq C4::Context->userenv->{'deskcode'});
75
    }
76
    else {
77
	$deskh->{'selected'} = 1 if ($deskcode eq $deskh->{'deskcode'});
78
    }
79
    push @deskloop, $deskh;
80
}
81
$template->param(deskloop  => \@deskloop);
82
67
my $transfer_when_cancel_all = C4::Context->preference('TransferWhenCancelAllWaitingHolds');
83
my $transfer_when_cancel_all = C4::Context->preference('TransferWhenCancelAllWaitingHolds');
68
$template->param( TransferWhenCancelAllWaitingHolds => 1 ) if $transfer_when_cancel_all;
84
$template->param( TransferWhenCancelAllWaitingHolds => 1 ) if $transfer_when_cancel_all;
69
85
Lines 90-96 my @getreserves = $all_branches ? GetReservesForBranch() : GetReservesForBranch( Link Here
90
my $today = Date_to_Days(&Today);
106
my $today = Date_to_Days(&Today);
91
foreach my $num (@getreserves) {
107
foreach my $num (@getreserves) {
92
    next unless ($num->{'waitingdate'} && $num->{'waitingdate'} ne '0000-00-00');
108
    next unless ($num->{'waitingdate'} && $num->{'waitingdate'} ne '0000-00-00');
93
109
    if ($deskcode) {
110
	next if ($num->{'deskcode'} ne $deskcode && $deskcode ne '*');
111
    }
112
    elsif (C4::Context->userenv->{'deskcode'} ne $num->{'deskcode'}) {
113
	next;
114
    }
94
    my $itemnumber = $num->{'itemnumber'};
115
    my $itemnumber = $num->{'itemnumber'};
95
    my $gettitle     = GetBiblioFromItemNumber( $itemnumber );
116
    my $gettitle     = GetBiblioFromItemNumber( $itemnumber );
96
    my $borrowernum = $num->{'borrowernumber'};
117
    my $borrowernum = $num->{'borrowernumber'};
Lines 100-105 foreach my $num (@getreserves) { Link Here
100
    if ($desk) {
121
    if ($desk) {
101
        $deskname = $desk->{'deskname'};
122
        $deskname = $desk->{'deskname'};
102
    }
123
    }
124
    $deskname = $num->{'deskcode'};
103
    my $holdingbranch = $gettitle->{'holdingbranch'};
125
    my $holdingbranch = $gettitle->{'holdingbranch'};
104
    my $homebranch = $gettitle->{'homebranch'};
126
    my $homebranch = $gettitle->{'homebranch'};
105
127
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tt (-1 / +13 lines)
Lines 8-13 Link Here
8
<script type="text/javascript">
8
<script type="text/javascript">
9
//<![CDATA[
9
//<![CDATA[
10
     $(document).ready(function() {
10
     $(document).ready(function() {
11
        $('#selectdesk').find("input:submit").hide();
12
        $('#deskcode').change(function() {
13
                $('#selectdesk').submit();
14
         });
11
         $('#resultlist').tabs();
15
         $('#resultlist').tabs();
12
         $("th a").hide();
16
         $("th a").hide();
13
        $("#holdst,#holdso").dataTable($.extend(true, {}, dataTablesDefaults, {
17
        $("#holdst,#holdso").dataTable($.extend(true, {}, dataTablesDefaults, {
Lines 43-48 Link Here
43
            View all libraries</a></span>
47
            View all libraries</a></span>
44
            [% END %]
48
            [% END %]
45
        </h2>
49
        </h2>
50
	<form method="get" action="/cgi-bin/koha/circ/waitingreserves.pl" id="selectdesk">
51
	Select a desk :
52
	<select name="deskcode" id="deskcode" >
53
                <option value="*">All desks</option>
54
            [% FOREACH deskloo IN deskloop %]
55
				[% IF ( deskloo.selected ) %]<option value="[% deskloo.deskcode %]" selected="selected">[% deskloo.deskname %]</option>[% ELSE %]<option value="[% deskloo.deskcode %]">[% deskloo.deskname %]</option>[% END %]
56
            [% END %]
57
            </select>
58
        </form>
46
    [% IF ( cancel_result ) %]
59
    [% IF ( cancel_result ) %]
47
        [% FOREACH cancel_result %]
60
        [% FOREACH cancel_result %]
48
            [% IF ( messagetransfert ) %]
61
            [% IF ( messagetransfert ) %]
49
- 

Return to bug 14654