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

(-)a/C4/Reserves.pm (-1 / +73 lines)
Lines 141-146 BEGIN { Link Here
141
        &GetReservesControlBranch
141
        &GetReservesControlBranch
142
142
143
        IsItemOnHoldAndFound
143
        IsItemOnHoldAndFound
144
145
        AddReserveGroup
146
        DeleteReserveGroup
147
        GetReserveGroupReserves
144
    );
148
    );
145
    @EXPORT_OK = qw( MergeHolds );
149
    @EXPORT_OK = qw( MergeHolds );
146
}
150
}
Lines 165-171 sub AddReserve { Link Here
165
    my (
169
    my (
166
        $branch,   $borrowernumber, $biblionumber, $bibitems,
170
        $branch,   $borrowernumber, $biblionumber, $bibitems,
167
        $priority, $resdate,        $expdate,      $notes,
171
        $priority, $resdate,        $expdate,      $notes,
168
        $title,    $checkitem,      $found,        $itemtype
172
        $title,    $checkitem,      $found,        $itemtype,
173
        $reserve_group_id
169
    ) = @_;
174
    ) = @_;
170
175
171
    if ( Koha::Holds->search( { borrowernumber => $borrowernumber, biblionumber => $biblionumber } )->count() > 0 ) {
176
    if ( Koha::Holds->search( { borrowernumber => $borrowernumber, biblionumber => $biblionumber } )->count() > 0 ) {
Lines 210-215 sub AddReserve { Link Here
210
            waitingdate    => $waitingdate,
215
            waitingdate    => $waitingdate,
211
            expirationdate => $expdate,
216
            expirationdate => $expdate,
212
            itemtype       => $itemtype,
217
            itemtype       => $itemtype,
218
            reserve_group_id => $reserve_group_id,
213
        }
219
        }
214
    )->store();
220
    )->store();
215
    my $reserve_id = $hold->id();
221
    my $reserve_id = $hold->id();
Lines 1348-1353 sub ModReserveAffect { Link Here
1348
    }
1354
    }
1349
    $sth = $dbh->prepare($query);
1355
    $sth = $dbh->prepare($query);
1350
    $sth->execute( $itemnumber, $borrowernumber,$biblionumber);
1356
    $sth->execute( $itemnumber, $borrowernumber,$biblionumber);
1357
1358
    if ($request->{reserve_group_id}) {
1359
        # Delete other reserves from same group
1360
        $dbh->do(q{
1361
            DELETE FROM reserves
1362
            WHERE reserve_group_id = ?
1363
              AND reserve_id != ?
1364
        }, undef, $request->{reserve_group_id}, $request->{reserve_id});
1365
        DeleteReserveGroup($request->{reserve_group_id});
1366
    }
1367
1351
    _koha_notify_reserve( $itemnumber, $borrowernumber, $biblionumber ) if ( !$transferToDo && !$already_on_shelf );
1368
    _koha_notify_reserve( $itemnumber, $borrowernumber, $biblionumber ) if ( !$transferToDo && !$already_on_shelf );
1352
    _FixPriority( { biblionumber => $biblionumber } );
1369
    _FixPriority( { biblionumber => $biblionumber } );
1353
    if ( C4::Context->preference("ReturnToShelvingCart") ) {
1370
    if ( C4::Context->preference("ReturnToShelvingCart") ) {
Lines 1427-1432 sub GetReserveInfo { Link Here
1427
                   reminderdate,
1444
                   reminderdate,
1428
                   priority,
1445
                   priority,
1429
                   found,
1446
                   found,
1447
                   reserve_group_id,
1430
                   firstname,
1448
                   firstname,
1431
                   surname,
1449
                   surname,
1432
                   phone,
1450
                   phone,
Lines 2482-2487 sub IsItemOnHoldAndFound { Link Here
2482
    return $found;
2500
    return $found;
2483
}
2501
}
2484
2502
2503
=head2 AddReserveGroup
2504
2505
    my $reserve_group_id = AddReserveGroup();
2506
2507
Creates a new reserve group and returns its ID
2508
2509
=cut
2510
2511
sub AddReserveGroup {
2512
    my $dbh = C4::Context->dbh;
2513
2514
    $dbh->do('INSERT INTO reserve_group VALUES ()');
2515
    return $dbh->last_insert_id(undef, undef, 'reserve_group', undef);
2516
}
2517
2518
=head2 DeleteReserveGroup
2519
2520
    DeleteReserveGroup($reserve_group_id);
2521
2522
Delete a reserve group. Reserves that belong to this group are not removed.
2523
2524
=cut
2525
2526
sub DeleteReserveGroup {
2527
    my ($reserve_group_id) = @_;
2528
2529
    my $dbh = C4::Context->dbh;
2530
    my $query = 'DELETE FROM reserve_group WHERE reserve_group_id = ?';
2531
    $dbh->do($query, undef, $reserve_group_id);
2532
}
2533
2534
=head2 GetReserveGroupReserves
2535
2536
    my @reserves = GetReserveGroupReserves($reserve_group_id);
2537
2538
Fetch all reserve from a reserve group.
2539
2540
=cut
2541
2542
sub GetReserveGroupReserves {
2543
    my ($reserve_group_id) = @_;
2544
2545
    my $dbh = C4::Context->dbh;
2546
2547
    my $reserves = $dbh->selectall_arrayref(q{
2548
        SELECT * FROM reserves
2549
        WHERE reserve_group_id = ?
2550
    }, { Slice => {} }, $reserve_group_id);
2551
2552
    return () unless defined $reserves;
2553
2554
    return @$reserves;
2555
}
2556
2485
=head1 AUTHOR
2557
=head1 AUTHOR
2486
2558
2487
Koha Development Team <http://koha-community.org/>
2559
Koha Development Team <http://koha-community.org/>
(-)a/Koha/Template/Plugin/Biblio.pm (+8 lines)
Lines 32-35 sub HoldsCount { Link Here
32
    return $holds->count();
32
    return $holds->count();
33
}
33
}
34
34
35
sub Get {
36
    my ($self, $biblionumber) = @_;
37
38
    my $biblio = Koha::Biblios->find($biblionumber);
39
40
    return $biblio;
41
}
42
35
1;
43
1;
(-)a/circ/pendingreserves.pl (-1 / +3 lines)
Lines 118-123 if ( $run_report ) { Link Here
118
            reminderdate,
118
            reminderdate,
119
            max(priority) as priority,
119
            max(priority) as priority,
120
            reserves.found,
120
            reserves.found,
121
            reserves.reserve_group_id,
121
            biblio.title,
122
            biblio.title,
122
            biblio.author,
123
            biblio.author,
123
            count(DISTINCT items.itemnumber) as icount,
124
            count(DISTINCT items.itemnumber) as icount,
Lines 167-173 if ( $run_report ) { Link Here
167
                biblionumber    => $data->{biblionumber},
168
                biblionumber    => $data->{biblionumber},
168
                statusw         => ( $data->{found} eq "W" ),
169
                statusw         => ( $data->{found} eq "W" ),
169
                statusf         => ( $data->{found} eq "F" ),
170
                statusf         => ( $data->{found} eq "F" ),
170
                holdingbranches => [split('\|', $data->{l_holdingbranch})],,
171
                reserve_group_id => $data->{reserve_group_id},
172
                holdingbranches => [split('\|', $data->{l_holdingbranch})],
171
                branch          => $data->{l_branch},
173
                branch          => $data->{l_branch},
172
                itemcallnumber  => $data->{l_itemcallnumber},
174
                itemcallnumber  => $data->{l_itemcallnumber},
173
                enumchron       => $data->{l_enumchron},
175
                enumchron       => $data->{l_enumchron},
(-)a/installer/data/mysql/atomicupdate/bug_15516.sql (+8 lines)
Line 0 Link Here
1
DROP TABLE IF EXISTS reserve_group;
2
CREATE TABLE reserve_group (
3
  reserve_group_id int unsigned NOT NULL AUTO_INCREMENT,
4
  PRIMARY KEY (reserve_group_id)
5
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
6
7
ALTER TABLE reserves ADD COLUMN reserve_group_id int unsigned NULL DEFAULT NULL;
8
ALTER TABLE reserves ADD CONSTRAINT reserves_ibfk_6 FOREIGN KEY (reserve_group_id) REFERENCES reserve_group (reserve_group_id) ON DELETE SET NULL ON UPDATE CASCADE;
(-)a/installer/data/mysql/kohastructure.sql (-1 / +13 lines)
Lines 1864-1869 CREATE TABLE `reserves` ( -- information related to holds/reserves in Koha Link Here
1864
  `suspend` BOOLEAN NOT NULL DEFAULT 0,
1864
  `suspend` BOOLEAN NOT NULL DEFAULT 0,
1865
  `suspend_until` DATETIME NULL DEFAULT NULL,
1865
  `suspend_until` DATETIME NULL DEFAULT NULL,
1866
  `itemtype` VARCHAR(10) NULL DEFAULT NULL, -- If record level hold, the optional itemtype of the item the patron is requesting
1866
  `itemtype` VARCHAR(10) NULL DEFAULT NULL, -- If record level hold, the optional itemtype of the item the patron is requesting
1867
  `reserve_group_id` int unsigned NULL DEFAULT NULL,  -- Id used on reservations spanning multiple titles
1867
  PRIMARY KEY (`reserve_id`),
1868
  PRIMARY KEY (`reserve_id`),
1868
  KEY priorityfoundidx (priority,found),
1869
  KEY priorityfoundidx (priority,found),
1869
  KEY `borrowernumber` (`borrowernumber`),
1870
  KEY `borrowernumber` (`borrowernumber`),
Lines 1875-1881 CREATE TABLE `reserves` ( -- information related to holds/reserves in Koha Link Here
1875
  CONSTRAINT `reserves_ibfk_2` FOREIGN KEY (`biblionumber`) REFERENCES `biblio` (`biblionumber`) ON DELETE CASCADE ON UPDATE CASCADE,
1876
  CONSTRAINT `reserves_ibfk_2` FOREIGN KEY (`biblionumber`) REFERENCES `biblio` (`biblionumber`) ON DELETE CASCADE ON UPDATE CASCADE,
1876
  CONSTRAINT `reserves_ibfk_3` FOREIGN KEY (`itemnumber`) REFERENCES `items` (`itemnumber`) ON DELETE CASCADE ON UPDATE CASCADE,
1877
  CONSTRAINT `reserves_ibfk_3` FOREIGN KEY (`itemnumber`) REFERENCES `items` (`itemnumber`) ON DELETE CASCADE ON UPDATE CASCADE,
1877
  CONSTRAINT `reserves_ibfk_4` FOREIGN KEY (`branchcode`) REFERENCES `branches` (`branchcode`) ON DELETE CASCADE ON UPDATE CASCADE,
1878
  CONSTRAINT `reserves_ibfk_4` FOREIGN KEY (`branchcode`) REFERENCES `branches` (`branchcode`) ON DELETE CASCADE ON UPDATE CASCADE,
1878
  CONSTRAINT `reserves_ibfk_5` FOREIGN KEY (`itemtype`) REFERENCES `itemtypes` (`itemtype`) ON DELETE CASCADE ON UPDATE CASCADE
1879
  CONSTRAINT `reserves_ibfk_5` FOREIGN KEY (`itemtype`) REFERENCES `itemtypes` (`itemtype`) ON DELETE CASCADE ON UPDATE CASCADE,
1880
  CONSTRAINT `reserves_ibfk_6` FOREIGN KEY (`reserve_group_id`) REFERENCES `reserve_group` (`reserve_group_id`) ON DELETE SET NULL ON UPDATE CASCADE
1881
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
1882
1883
--
1884
-- Table structure for table reserve_group
1885
--
1886
1887
DROP TABLE IF EXISTS `reserve_group`;
1888
CREATE TABLE `reserve_group` (
1889
  `reserve_group_id` int unsigned NOT NULL AUTO_INCREMENT,
1890
  PRIMARY KEY(`reserve_group_id`)
1879
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
1891
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
1880
1892
1881
--
1893
--
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/reserve-group-modal.inc (+27 lines)
Line 0 Link Here
1
<div id="reserve-group-modal" class="modal hide" tabindex="-1" role="dialog" aria-labelledby="reserve-group-modal-label" aria-hidden="true">
2
    <div class="modal-header">
3
        <button type="button" class="closebtn" data-dismiss="modal" aria-hidden="true">×</button>
4
        <h3 id="reserve-group-modal-label">Reserve group</h3>
5
    </div>
6
    <div class="modal-body">
7
        <div id="loading"> <img src="[% interface %]/[% theme %]/img/loading-small.gif" alt="" /> Loading </div>
8
    </div>
9
    <div class="modal-footer">
10
        <button class="btn" data-dismiss="modal" aria-hidden="true">Close</button>
11
    </div>
12
</div>
13
14
<script>
15
  $(document).ready(function() {
16
    $('body').on('click', 'a.reserve-group', function() {
17
      var href = $(this).attr('href');
18
      $('#reserve-group-modal .modal-body').load(href + " #main");
19
      $('#reserve-group-modal').modal('show');
20
      return false;
21
    })
22
23
    $('#reserve-group-modal').on('hidden', function(){
24
        $('#reserve-group-modal .modal-body').html('<div id="loading"><img src="[% interface %]/[% theme %]/img/loading-small.gif" alt="" /> ' + _('Loading') + '</div>');
25
    });
26
  });
27
</script>
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/strings.inc (+2 lines)
Lines 39-43 Link Here
39
    var SUSPEND_HOLD_ERROR_DATE = _("Unable to suspend hold, invalid date");
39
    var SUSPEND_HOLD_ERROR_DATE = _("Unable to suspend hold, invalid date");
40
    var SUSPEND_HOLD_ERROR_NOT_FOUND = _("Unable to suspend hold, hold not found");
40
    var SUSPEND_HOLD_ERROR_NOT_FOUND = _("Unable to suspend hold, hold not found");
41
    var RESUME_HOLD_ERROR_NOT_FOUND = _("Unable to resume, hold not found");
41
    var RESUME_HOLD_ERROR_NOT_FOUND = _("Unable to resume, hold not found");
42
    var PART_OF_A = _("(part of a %s)");
43
    var RESERVE_GROUP = _("reserve group");
42
//]]>
44
//]]>
43
</script>
45
</script>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt (+1 lines)
Lines 979-982 No patron matched <span class="ex">[% message %]</span> Link Here
979
        <p>You have already submitted a barcode, please wait for the checkout to process...</p>
979
        <p>You have already submitted a barcode, please wait for the checkout to process...</p>
980
    </div>
980
    </div>
981
</div>
981
</div>
982
[% INCLUDE 'reserve-group-modal.inc' %]
982
[% INCLUDE 'intranet-bottom.inc' %]
983
[% INCLUDE 'intranet-bottom.inc' %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tt (-4 / +11 lines)
Lines 112-121 $(document).ready(function() { Link Here
112
            <td>[% reserveloo.count %]</td>
112
            <td>[% reserveloo.count %]</td>
113
            <td>[% reserveloo.rcount %]</td>
113
            <td>[% reserveloo.rcount %]</td>
114
            <td>
114
            <td>
115
            <p>
115
                <p>
116
                [% INCLUDE 'biblio-default-view.inc' biblionumber = reserveloo.biblionumber %]
116
                    [% INCLUDE 'biblio-default-view.inc' biblionumber = reserveloo.biblionumber %]
117
                [% reserveloo.title |html %]</a></p>
117
                    [% reserveloo.title |html %]</a>
118
                [% IF ( reserveloo.author ) %]<p> by [% reserveloo.author %]</p>[% END %]
118
                </p>
119
                [% IF ( reserveloo.author ) %]
120
                    <p> by [% reserveloo.author %]</p>
121
                [% END %]
122
                [% IF reserveloo.reserve_group_id %]
123
                    <p>(part of a <a class="reserve-group" href="/cgi-bin/koha/reserve/reserve-group.pl?reserve_group_id=[% reserveloo.reserve_group_id %]">reserve group</a>)</p>
124
                [% END %]
119
            </td>
125
            </td>
120
        [% ELSE %]
126
        [% ELSE %]
121
            <td>"</td>
127
            <td>"</td>
Lines 199-202 $(document).ready(function() { Link Here
199
</div>
205
</div>
200
</div>
206
</div>
201
</div>
207
</div>
208
[% INCLUDE 'reserve-group-modal.inc' %]
202
[% INCLUDE 'intranet-bottom.inc' %]
209
[% INCLUDE 'intranet-bottom.inc' %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt (+1 lines)
Lines 562-565 function validate1(date) { Link Here
562
[% INCLUDE 'circ-menu.inc' %]
562
[% INCLUDE 'circ-menu.inc' %]
563
</div>
563
</div>
564
</div>
564
</div>
565
[% INCLUDE 'reserve-group-modal.inc' %]
565
[% INCLUDE 'intranet-bottom.inc' %]
566
[% INCLUDE 'intranet-bottom.inc' %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt (-3 / +11 lines)
Lines 401-413 function checkMultiHold() { Link Here
401
        <a href="#" id="clear-date-to" class="clear-date">Clear date</a>
401
        <a href="#" id="clear-date-to" class="clear-date">Clear date</a>
402
	</li>
402
	</li>
403
403
404
        [% UNLESS ( multi_hold ) %]
405
          <li> <label for="requestany">Place a hold on the next available item </label>
404
          <li> <label for="requestany">Place a hold on the next available item </label>
406
               <input type="checkbox" id="requestany" name="request" checked="checked" value="Any" />
405
              [% IF multi_hold %]
406
                  <input type="checkbox" id="requestany" name="requestany" value="1" />
407
              [% ELSE %]
408
                  <input type="checkbox" id="requestany" name="requestany" checked="checked" value="1" />
409
              [% END %]
407
               <input type="hidden" name="biblioitem" value="[% biblioitemnumber %]" />
410
               <input type="hidden" name="biblioitem" value="[% biblioitemnumber %]" />
408
               <input type="hidden" name="alreadyreserved" value="[% alreadyreserved %]" />
411
               <input type="hidden" name="alreadyreserved" value="[% alreadyreserved %]" />
409
          </li>
412
          </li>
410
        [% END %]
411
413
412
</ol>
414
</ol>
413
   [% UNLESS ( multi_hold ) %]
415
   [% UNLESS ( multi_hold ) %]
Lines 783-788 function checkMultiHold() { Link Here
783
                 <input type="hidden" name="itemnumber" value="" />
785
                 <input type="hidden" name="itemnumber" value="" />
784
            [% END %]
786
            [% END %]
785
    [% END %]
787
    [% END %]
788
            [% IF reserveloo.reserve_group_id %]
789
                <div>(part of a <a href="/cgi-bin/koha/reserve/reserve-group.pl?reserve_group_id=[% reserveloo.reserve_group_id %]" class="reserve-group">reserve group</a>)</div>
790
            [% END %]
786
        </td>
791
        </td>
787
792
788
    [% IF ( CAN_user_reserveforothers_modify_holds_priority ) %]
793
    [% IF ( CAN_user_reserveforothers_modify_holds_priority ) %]
Lines 843-846 function checkMultiHold() { Link Here
843
848
844
</div>
849
</div>
845
</div>
850
</div>
851
852
[% INCLUDE 'reserve-group-modal.inc' %]
853
846
[% INCLUDE 'intranet-bottom.inc' %]
854
[% INCLUDE 'intranet-bottom.inc' %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/reserve-group.tt (+30 lines)
Line 0 Link Here
1
[% USE Biblio %]
2
[% INCLUDE 'doc-head-open.inc' %]
3
  <title>Koha &rsaquo; Circulation &rsaquo; Holds &rsaquo; Holds group ([% reserve_group_id %])</title>
4
  [% INCLUDE 'doc-head-close.inc' %]
5
</head>
6
<body id="reserve-reserve-group">
7
  <h1>Holds group ([% reserve_group_id %])</h1>
8
  <div id="main">
9
    [% IF reserves.size %]
10
      <table>
11
        <thead>
12
          <tr>
13
            <th>Title</th>
14
            <th>Priority</th>
15
            <th>Notes</th>
16
          </tr>
17
        </thead>
18
        <tbody>
19
          [% FOREACH reserve IN reserves %]
20
            [% biblio = Biblio.Get(reserve.biblionumber) %]
21
            <tr>
22
              <td><a href="/cgi-bin/koha/reserve/request.pl?biblionumber=[% biblio.biblionumber %]">[% biblio.title %]</a></td>
23
              <td>[% reserve.priority %]</td>
24
              <td>[% reserve.reservenotes %]</td>
25
            </tr>
26
          [% END %]
27
        </tbody>
28
      <table>
29
    [% END %]
30
  [% INCLUDE 'intranet-bottom.inc' %]
(-)a/koha-tmpl/intranet-tmpl/prog/js/holds.js (+6 lines)
Lines 42-47 $(document).ready(function() { Link Here
42
                                title += " - <span class='" + span_class + "'>" + oObj.itemnotes + "</span>"
42
                                title += " - <span class='" + span_class + "'>" + oObj.itemnotes + "</span>"
43
                            }
43
                            }
44
44
45
                            if (oObj.reserve_group_id) {
46
                              title += '<br>';
47
                              var link = '<a class="reserve-group" href="/cgi-bin/koha/reserve/reserve-group.pl?reserve_group_id=' + oObj.reserve_group_id + '">' + RESERVE_GROUP +'</a>'
48
                              title += '<span>' + PART_OF_A.format(link) + '</span>';
49
                            }
50
45
                            return title;
51
                            return title;
46
                        }
52
                        }
47
                    },
53
                    },
(-)a/reserve/placerequest.pl (-2 / +10 lines)
Lines 50-55 my $title = $input->param('title'); Link Here
50
my $checkitem      = $input->param('checkitem');
50
my $checkitem      = $input->param('checkitem');
51
my $expirationdate = $input->param('expiration_date');
51
my $expirationdate = $input->param('expiration_date');
52
my $itemtype       = $input->param('itemtype') || undef;
52
my $itemtype       = $input->param('itemtype') || undef;
53
my $requestany     = $input->param('requestany');
53
54
54
my $borrower = GetMember( 'borrowernumber' => $borrowernumber );
55
my $borrower = GetMember( 'borrowernumber' => $borrowernumber );
55
56
Lines 81-86 if (defined $checkitem && $checkitem ne ''){ Link Here
81
82
82
if ($type eq 'str8' && $borrower){
83
if ($type eq 'str8' && $borrower){
83
84
85
    my $reserve_group_id;
86
    if ($multi_hold && $requestany) {
87
        $reserve_group_id = AddReserveGroup();
88
    }
89
84
    foreach my $biblionumber (keys %bibinfos) {
90
    foreach my $biblionumber (keys %bibinfos) {
85
        my $count=@bibitems;
91
        my $count=@bibitems;
86
        @bibitems=sort @bibitems;
92
        @bibitems=sort @bibitems;
Lines 106-113 if ($type eq 'str8' && $borrower){ Link Here
106
112
107
        if ($multi_hold) {
113
        if ($multi_hold) {
108
            my $bibinfo = $bibinfos{$biblionumber};
114
            my $bibinfo = $bibinfos{$biblionumber};
109
            AddReserve($branch,$borrower->{'borrowernumber'},$biblionumber,[$biblionumber],
115
            AddReserve($branch, $borrower->{'borrowernumber'}, $biblionumber,
110
                       $bibinfo->{rank},$startdate,$expirationdate,$notes,$bibinfo->{title},$checkitem,$found);
116
                [$biblionumber], $bibinfo->{rank}, $startdate, $expirationdate,
117
                $notes, $bibinfo->{title}, $checkitem, $found,
118
                $reserve_group_id);
111
        } else {
119
        } else {
112
            # place a request on 1st available
120
            # place a request on 1st available
113
            AddReserve($branch,$borrower->{'borrowernumber'},$biblionumber,\@realbi,$rank[0],$startdate,$expirationdate,$notes,$title,$checkitem,$found, $itemtype);
121
            AddReserve($branch,$borrower->{'borrowernumber'},$biblionumber,\@realbi,$rank[0],$startdate,$expirationdate,$notes,$title,$checkitem,$found, $itemtype);
(-)a/reserve/request.pl (+1 lines)
Lines 568-573 foreach my $biblionumber (@biblionumbers) { Link Here
568
        $reserve{'suspend_until'}  = $res->suspend_until();
568
        $reserve{'suspend_until'}  = $res->suspend_until();
569
        $reserve{'reserve_id'}     = $res->reserve_id();
569
        $reserve{'reserve_id'}     = $res->reserve_id();
570
        $reserve{itemtype}         = $res->itemtype();
570
        $reserve{itemtype}         = $res->itemtype();
571
        $reserve{'reserve_group_id'} = $res->reserve_group_id;
571
572
572
        if ( C4::Context->preference('IndependentBranches') && $flags->{'superlibrarian'} != 1 ) {
573
        if ( C4::Context->preference('IndependentBranches') && $flags->{'superlibrarian'} != 1 ) {
573
            $reserve{'branchloop'} = [ Koha::Libraries->find( $res->branchcode() ) ];
574
            $reserve{'branchloop'} = [ Koha::Libraries->find( $res->branchcode() ) ];
(-)a/reserve/reserve-group.pl (+42 lines)
Line 0 Link Here
1
#!/usr/bin/env perl
2
3
# This file is part of Koha.
4
#
5
# Koha is free software; you can redistribute it and/or modify it
6
# under the terms of the GNU General Public License as published by
7
# the Free Software Foundation; either version 3 of the License, or
8
# (at your option) any later version.
9
#
10
# Koha is distributed in the hope that it will be useful, but
11
# WITHOUT ANY WARRANTY; without even the implied warranty of
12
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
13
# GNU General Public License for more details.
14
#
15
# You should have received a copy of the GNU General Public License
16
# along with Koha; if not, see <http://www.gnu.org/licenses>.
17
18
use Modern::Perl;
19
use CGI qw( -utf8 );
20
21
use C4::Auth;
22
use C4::Output;
23
use C4::Reserves;
24
25
my $cgi = new CGI;
26
my ($template, $loggedinuser, $cookie) = get_template_and_user({
27
    template_name   => "reserve/reserve-group.tt",
28
    query           => $cgi,
29
    type            => "intranet",
30
    authnotrequired => 0,
31
    flagsrequired   => { circulate => 'circulate_remaining_permissions' },
32
});
33
34
my $reserve_group_id = $cgi->param('reserve_group_id');
35
my @reserves = GetReserveGroupReserves($reserve_group_id);
36
37
$template->param(
38
    reserve_group_id => $reserve_group_id,
39
    reserves => \@reserves,
40
);
41
42
output_html_with_http_headers $cgi, $cookie, $template->output;
(-)a/svc/holds (-1 / +1 lines)
Lines 96-101 while ( my $h = $holds_rs->next() ) { Link Here
96
        waiting_here   => $h->branch()->branchcode() eq $branch,
96
        waiting_here   => $h->branch()->branchcode() eq $branch,
97
        priority       => $h->priority(),
97
        priority       => $h->priority(),
98
        itemtype_limit => $itemtype_limit,
98
        itemtype_limit => $itemtype_limit,
99
        reserve_group_id => $h->reserve_group_id,
99
        subtitle       => GetRecordValue(
100
        subtitle       => GetRecordValue(
100
            'subtitle', GetMarcBiblio($biblionumber),
101
            'subtitle', GetMarcBiblio($biblionumber),
101
            GetFrameworkCode($biblionumber)
102
            GetFrameworkCode($biblionumber)
102
- 

Return to bug 15516