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

(-)a/C4/Reserves.pm (-1 / +72 lines)
Lines 148-153 BEGIN { Link Here
148
        IsItemOnHoldAndFound
148
        IsItemOnHoldAndFound
149
149
150
        GetMaxPatronHoldsForRecord
150
        GetMaxPatronHoldsForRecord
151
152
        &AddReserveGroup
153
        &DeleteReserveGroup
154
        &GetReserveGroupReserves
151
    );
155
    );
152
    @EXPORT_OK = qw( MergeHolds );
156
    @EXPORT_OK = qw( MergeHolds );
153
}
157
}
Lines 172-178 sub AddReserve { Link Here
172
    my (
176
    my (
173
        $branch,   $borrowernumber, $biblionumber, $bibitems,
177
        $branch,   $borrowernumber, $biblionumber, $bibitems,
174
        $priority, $resdate,        $expdate,      $notes,
178
        $priority, $resdate,        $expdate,      $notes,
175
        $title,    $checkitem,      $found,        $itemtype
179
        $title,    $checkitem,      $found,        $itemtype,
180
        $reserve_group_id
176
    ) = @_;
181
    ) = @_;
177
182
178
    $resdate = output_pref( { str => dt_from_string( $resdate ), dateonly => 1, dateformat => 'iso' })
183
    $resdate = output_pref( { str => dt_from_string( $resdate ), dateonly => 1, dateformat => 'iso' })
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
221
Lines 1346-1351 sub ModReserveAffect { Link Here
1346
    }
1352
    }
1347
    $hold->store();
1353
    $hold->store();
1348
1354
1355
    if ($hold->reserve_group_id) {
1356
        # Delete other reserves from same group
1357
        $dbh->do(q{
1358
            DELETE FROM reserves
1359
            WHERE reserve_group_id = ?
1360
              AND reserve_id != ?
1361
        }, undef, $hold->reserve_group_id, $hold->reserve_id);
1362
        DeleteReserveGroup($hold->reserve_group_id);
1363
    }
1364
1349
    _koha_notify_reserve( $hold->reserve_id )
1365
    _koha_notify_reserve( $hold->reserve_id )
1350
      if ( !$transferToDo && !$already_on_shelf );
1366
      if ( !$transferToDo && !$already_on_shelf );
1351
1367
Lines 1428-1433 sub GetReserveInfo { Link Here
1428
                   reminderdate,
1444
                   reminderdate,
1429
                   priority,
1445
                   priority,
1430
                   found,
1446
                   found,
1447
                   reserve_group_id,
1431
                   firstname,
1448
                   firstname,
1432
                   surname,
1449
                   surname,
1433
                   phone,
1450
                   phone,
Lines 2532-2537 sub GetHoldRule { Link Here
2532
    return $sth->fetchrow_hashref();
2549
    return $sth->fetchrow_hashref();
2533
}
2550
}
2534
2551
2552
=head2 AddReserveGroup
2553
2554
    my $reserve_group_id = AddReserveGroup();
2555
2556
Creates a new reserve group and returns its ID
2557
2558
=cut
2559
2560
sub AddReserveGroup {
2561
    my $dbh = C4::Context->dbh;
2562
2563
    $dbh->do('INSERT INTO reserve_group VALUES ()');
2564
    return $dbh->last_insert_id(undef, undef, 'reserve_group', undef);
2565
}
2566
2567
=head2 DeleteReserveGroup
2568
2569
    DeleteReserveGroup($reserve_group_id);
2570
2571
Delete a reserve group. Reserves that belong to this group are not removed.
2572
2573
=cut
2574
2575
sub DeleteReserveGroup {
2576
    my ($reserve_group_id) = @_;
2577
2578
    my $dbh = C4::Context->dbh;
2579
    my $query = 'DELETE FROM reserve_group WHERE reserve_group_id = ?';
2580
    $dbh->do($query, undef, $reserve_group_id);
2581
}
2582
2583
=head2 GetReserveGroupReserves
2584
2585
    my @reserves = GetReserveGroupReserves($reserve_group_id);
2586
2587
Fetch all reserve from a reserve group.
2588
2589
=cut
2590
2591
sub GetReserveGroupReserves {
2592
    my ($reserve_group_id) = @_;
2593
2594
    my $dbh = C4::Context->dbh;
2595
2596
    my $reserves = $dbh->selectall_arrayref(q{
2597
        SELECT * FROM reserves
2598
        WHERE reserve_group_id = ?
2599
    }, { Slice => {} }, $reserve_group_id);
2600
2601
    return () unless defined $reserves;
2602
2603
    return @$reserves;
2604
}
2605
2535
=head1 AUTHOR
2606
=head1 AUTHOR
2536
2607
2537
Koha Development Team <http://koha-community.org/>
2608
Koha Development Team <http://koha-community.org/>
(-)a/Koha/Template/Plugin/Biblio.pm (+8 lines)
Lines 63-66 sub CanArticleRequest { Link Here
63
    return $biblio ? $biblio->can_article_request( $borrower ) : 0;
63
    return $biblio ? $biblio->can_article_request( $borrower ) : 0;
64
}
64
}
65
65
66
sub Get {
67
    my ($self, $biblionumber) = @_;
68
69
    my $biblio = Koha::Biblios->find($biblionumber);
70
71
    return $biblio;
72
}
73
66
1;
74
1;
(-)a/circ/pendingreserves.pl (-1 / +3 lines)
Lines 119-124 if ( $run_report ) { Link Here
119
            reminderdate,
119
            reminderdate,
120
            max(priority) as priority,
120
            max(priority) as priority,
121
            reserves.found,
121
            reserves.found,
122
            reserves.reserve_group_id,
122
            biblio.title,
123
            biblio.title,
123
            biblio.author,
124
            biblio.author,
124
            count(DISTINCT items.itemnumber) as icount,
125
            count(DISTINCT items.itemnumber) as icount,
Lines 173-179 if ( $run_report ) { Link Here
173
                biblionumber    => $data->{biblionumber},
174
                biblionumber    => $data->{biblionumber},
174
                statusw         => ( $data->{found} eq "W" ),
175
                statusw         => ( $data->{found} eq "W" ),
175
                statusf         => ( $data->{found} eq "F" ),
176
                statusf         => ( $data->{found} eq "F" ),
176
                holdingbranches => [split('\|', $data->{l_holdingbranch})],,
177
                reserve_group_id => $data->{reserve_group_id},
178
                holdingbranches => [split('\|', $data->{l_holdingbranch})],
177
                branch          => $data->{l_branch},
179
                branch          => $data->{l_branch},
178
                itemcallnumber  => $data->{l_itemcallnumber},
180
                itemcallnumber  => $data->{l_itemcallnumber},
179
                enumchron       => $data->{l_enumchron},
181
                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 1883-1888 CREATE TABLE `reserves` ( -- information related to holds/reserves in Koha Link Here
1883
  `suspend` BOOLEAN NOT NULL DEFAULT 0,
1883
  `suspend` BOOLEAN NOT NULL DEFAULT 0,
1884
  `suspend_until` DATETIME NULL DEFAULT NULL,
1884
  `suspend_until` DATETIME NULL DEFAULT NULL,
1885
  `itemtype` VARCHAR(10) NULL DEFAULT NULL, -- If record level hold, the optional itemtype of the item the patron is requesting
1885
  `itemtype` VARCHAR(10) NULL DEFAULT NULL, -- If record level hold, the optional itemtype of the item the patron is requesting
1886
  `reserve_group_id` int unsigned NULL DEFAULT NULL,  -- Id used on reservations spanning multiple titles
1886
  PRIMARY KEY (`reserve_id`),
1887
  PRIMARY KEY (`reserve_id`),
1887
  KEY priorityfoundidx (priority,found),
1888
  KEY priorityfoundidx (priority,found),
1888
  KEY `borrowernumber` (`borrowernumber`),
1889
  KEY `borrowernumber` (`borrowernumber`),
Lines 1894-1900 CREATE TABLE `reserves` ( -- information related to holds/reserves in Koha Link Here
1894
  CONSTRAINT `reserves_ibfk_2` FOREIGN KEY (`biblionumber`) REFERENCES `biblio` (`biblionumber`) ON DELETE CASCADE ON UPDATE CASCADE,
1895
  CONSTRAINT `reserves_ibfk_2` FOREIGN KEY (`biblionumber`) REFERENCES `biblio` (`biblionumber`) ON DELETE CASCADE ON UPDATE CASCADE,
1895
  CONSTRAINT `reserves_ibfk_3` FOREIGN KEY (`itemnumber`) REFERENCES `items` (`itemnumber`) ON DELETE CASCADE ON UPDATE CASCADE,
1896
  CONSTRAINT `reserves_ibfk_3` FOREIGN KEY (`itemnumber`) REFERENCES `items` (`itemnumber`) ON DELETE CASCADE ON UPDATE CASCADE,
1896
  CONSTRAINT `reserves_ibfk_4` FOREIGN KEY (`branchcode`) REFERENCES `branches` (`branchcode`) ON DELETE CASCADE ON UPDATE CASCADE,
1897
  CONSTRAINT `reserves_ibfk_4` FOREIGN KEY (`branchcode`) REFERENCES `branches` (`branchcode`) ON DELETE CASCADE ON UPDATE CASCADE,
1897
  CONSTRAINT `reserves_ibfk_5` FOREIGN KEY (`itemtype`) REFERENCES `itemtypes` (`itemtype`) ON DELETE CASCADE ON UPDATE CASCADE
1898
  CONSTRAINT `reserves_ibfk_5` FOREIGN KEY (`itemtype`) REFERENCES `itemtypes` (`itemtype`) ON DELETE CASCADE ON UPDATE CASCADE,
1899
  CONSTRAINT `reserves_ibfk_6` FOREIGN KEY (`reserve_group_id`) REFERENCES `reserve_group` (`reserve_group_id`) ON DELETE SET NULL ON UPDATE CASCADE
1900
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
1901
1902
--
1903
-- Table structure for table reserve_group
1904
--
1905
1906
DROP TABLE IF EXISTS `reserve_group`;
1907
CREATE TABLE `reserve_group` (
1908
  `reserve_group_id` int unsigned NOT NULL AUTO_INCREMENT,
1909
  PRIMARY KEY(`reserve_group_id`)
1898
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
1910
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
1899
1911
1900
--
1912
--
(-)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 41-45 Link Here
41
    var SUSPEND_HOLD_ERROR_NOT_FOUND = _("Unable to suspend hold, hold not found");
41
    var SUSPEND_HOLD_ERROR_NOT_FOUND = _("Unable to suspend hold, hold not found");
42
    var RESUME_HOLD_ERROR_NOT_FOUND = _("Unable to resume, hold not found");
42
    var RESUME_HOLD_ERROR_NOT_FOUND = _("Unable to resume, hold not found");
43
    var CURRENT = _(" (current) ");
43
    var CURRENT = _(" (current) ");
44
    var PART_OF_A = _("(part of a %s)");
45
    var RESERVE_GROUP = _("reserve group");
44
//]]>
46
//]]>
45
</script>
47
</script>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt (+1 lines)
Lines 1022-1025 No patron matched <span class="ex">[% message | html %]</span> Link Here
1022
    </div>
1022
    </div>
1023
    </div>
1023
    </div>
1024
</div>
1024
</div>
1025
[% INCLUDE 'reserve-group-modal.inc' %]
1025
[% INCLUDE 'intranet-bottom.inc' %]
1026
[% 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 %] [% FOREACH s IN reserveloo.subtitle %] [% s %][% END %]</a></p>
117
                    [% reserveloo.title |html %] [% FOREACH s IN reserveloo.subtitle %] [% s %][% END %]</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 624-627 function validate1(date) { Link Here
624
[% INCLUDE 'circ-menu.inc' %]
624
[% INCLUDE 'circ-menu.inc' %]
625
</div>
625
</div>
626
</div>
626
</div>
627
[% INCLUDE 'reserve-group-modal.inc' %]
627
[% INCLUDE 'intranet-bottom.inc' %]
628
[% INCLUDE 'intranet-bottom.inc' %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt (-4 / +14 lines)
Lines 406-425 function checkMultiHold() { Link Here
406
        <a href="#" id="clear-date-to" class="clear-date">Clear date</a>
406
        <a href="#" id="clear-date-to" class="clear-date">Clear date</a>
407
	</li>
407
	</li>
408
408
409
        [% UNLESS ( multi_hold ) %]
410
          <li> <label for="requestany">Hold next available item </label>
409
          <li> <label for="requestany">Hold next available item </label>
411
               [% IF force_hold_level == 'item' %]
410
              [% IF multi_hold %]
411
                  <input type="checkbox" id="requestany" name="requestany" value="1" />
412
              [% ELSE %]
413
                [% IF force_hold_level == 'item' %]
412
                   <input type="checkbox" id="requestany" name="request" disabled="true" />
414
                   <input type="checkbox" id="requestany" name="request" disabled="true" />
413
               [% ELSIF force_hold_level == 'record' %]
415
                [% ELSIF force_hold_level == 'record' %]
414
                   <input type="checkbox" id="requestany" checked="checked" value="Any" disabled="true"/>
416
                   <input type="checkbox" id="requestany" checked="checked" value="Any" disabled="true"/>
415
                   <input type="hidden" name="request" value="Any"/>
417
                   <input type="hidden" name="request" value="Any"/>
416
               [% ELSE %]
418
                [% ELSE %]
417
                   <input type="checkbox" id="requestany" name="request" checked="checked" value="Any" />
419
                   <input type="checkbox" id="requestany" name="request" checked="checked" value="Any" />
418
                [% END %]
420
                [% END %]
421
              [% END %]
419
               <input type="hidden" name="biblioitem" value="[% biblioitemnumber %]" />
422
               <input type="hidden" name="biblioitem" value="[% biblioitemnumber %]" />
420
               <input type="hidden" name="alreadyreserved" value="[% alreadyreserved %]" />
423
               <input type="hidden" name="alreadyreserved" value="[% alreadyreserved %]" />
421
          </li>
424
          </li>
422
425
426
        [% UNLESS ( multi_hold ) %]
423
          [% IF remaining_holds_for_record > 1 %]
427
          [% IF remaining_holds_for_record > 1 %]
424
              [% SET count = 1 %]
428
              [% SET count = 1 %]
425
              <li>
429
              <li>
Lines 840-845 function checkMultiHold() { Link Here
840
                 <input type="hidden" name="itemnumber" value="" />
844
                 <input type="hidden" name="itemnumber" value="" />
841
            [% END %]
845
            [% END %]
842
    [% END %]
846
    [% END %]
847
            [% IF reserveloo.reserve_group_id %]
848
                <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>
849
            [% END %]
843
        </td>
850
        </td>
844
851
845
    [% IF ( CAN_user_reserveforothers_modify_holds_priority ) %]
852
    [% IF ( CAN_user_reserveforothers_modify_holds_priority ) %]
Lines 902-905 function checkMultiHold() { Link Here
902
909
903
</div>
910
</div>
904
</div>
911
</div>
912
913
[% INCLUDE 'reserve-group-modal.inc' %]
914
905
[% INCLUDE 'intranet-bottom.inc' %]
915
[% 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 83-88 if (defined $checkitem && $checkitem ne ''){ Link Here
83
84
84
if ( $type eq 'str8' && $borrower ) {
85
if ( $type eq 'str8' && $borrower ) {
85
86
87
    my $reserve_group_id;
88
    if ($multi_hold && $requestany) {
89
        $reserve_group_id = AddReserveGroup();
90
    }
91
86
    foreach my $biblionumber ( keys %bibinfos ) {
92
    foreach my $biblionumber ( keys %bibinfos ) {
87
        my $count = @bibitems;
93
        my $count = @bibitems;
88
        @bibitems = sort @bibitems;
94
        @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, $itemtype,
118
                $reserve_group_id);
111
        } else {
119
        } else {
112
            # place a request on 1st available
120
            # place a request on 1st available
113
            for ( my $i = 0 ; $i < $holds_to_place_count ; $i++ ) {
121
            for ( my $i = 0 ; $i < $holds_to_place_count ; $i++ ) {
(-)a/reserve/request.pl (+1 lines)
Lines 581-586 foreach my $biblionumber (@biblionumbers) { Link Here
581
        $reserve{'reserve_id'}     = $res->reserve_id();
581
        $reserve{'reserve_id'}     = $res->reserve_id();
582
        $reserve{itemtype}         = $res->itemtype();
582
        $reserve{itemtype}         = $res->itemtype();
583
        $reserve{branchcode}       = $res->branchcode();
583
        $reserve{branchcode}       = $res->branchcode();
584
        $reserve{'reserve_group_id'} = $res->reserve_group_id;
584
585
585
        push( @reserveloop, \%reserve );
586
        push( @reserveloop, \%reserve );
586
    }
587
    }
(-)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 101-106 while ( my $h = $holds_rs->next() ) { Link Here
101
        waiting_here   => $h->branch()->branchcode() eq $branch,
101
        waiting_here   => $h->branch()->branchcode() eq $branch,
102
        priority       => $h->priority(),
102
        priority       => $h->priority(),
103
        itemtype_limit => $itemtype_limit,
103
        itemtype_limit => $itemtype_limit,
104
        reserve_group_id => $h->reserve_group_id,
104
        subtitle       => GetRecordValue(
105
        subtitle       => GetRecordValue(
105
            'subtitle', GetMarcBiblio($biblionumber),
106
            'subtitle', GetMarcBiblio($biblionumber),
106
            GetFrameworkCode($biblionumber)
107
            GetFrameworkCode($biblionumber)
107
- 

Return to bug 15516