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

(-)a/C4/Reserves.pm (-1 / +71 lines)
Lines 139-144 BEGIN { Link Here
139
        IsItemOnHoldAndFound
139
        IsItemOnHoldAndFound
140
140
141
        GetMaxPatronHoldsForRecord
141
        GetMaxPatronHoldsForRecord
142
143
        &AddReserveGroup
144
        &DeleteReserveGroup
145
        &GetReserveGroupReserves
142
    );
146
    );
143
    @EXPORT_OK = qw( MergeHolds );
147
    @EXPORT_OK = qw( MergeHolds );
144
}
148
}
Lines 164-170 sub AddReserve { Link Here
164
    my (
168
    my (
165
        $branch,   $borrowernumber, $biblionumber, $bibitems,
169
        $branch,   $borrowernumber, $biblionumber, $bibitems,
166
        $priority, $resdate,        $expdate,      $notes,
170
        $priority, $resdate,        $expdate,      $notes,
167
        $title,    $checkitem,      $found,        $itemtype
171
        $title,    $checkitem,      $found,        $itemtype,
172
        $reserve_group_id
168
    ) = @_;
173
    ) = @_;
169
174
170
    $resdate = output_pref( { str => dt_from_string( $resdate ), dateonly => 1, dateformat => 'iso' })
175
    $resdate = output_pref( { str => dt_from_string( $resdate ), dateonly => 1, dateformat => 'iso' })
Lines 212-217 sub AddReserve { Link Here
212
            waitingdate    => $waitingdate,
217
            waitingdate    => $waitingdate,
213
            expirationdate => $expdate,
218
            expirationdate => $expdate,
214
            itemtype       => $itemtype,
219
            itemtype       => $itemtype,
220
            reserve_group_id => $reserve_group_id,
215
        }
221
        }
216
    )->store();
222
    )->store();
217
    $hold->set_waiting() if $found eq 'W';
223
    $hold->set_waiting() if $found eq 'W';
Lines 1066-1071 sub ModReserveAffect { Link Here
1066
    $hold->itemnumber($itemnumber);
1072
    $hold->itemnumber($itemnumber);
1067
    $hold->set_waiting($transferToDo);
1073
    $hold->set_waiting($transferToDo);
1068
1074
1075
    if ($hold->reserve_group_id) {
1076
        # Delete other reserves from same group
1077
        $dbh->do(q{
1078
            DELETE FROM reserves
1079
            WHERE reserve_group_id = ?
1080
              AND reserve_id != ?
1081
        }, undef, $hold->reserve_group_id, $hold->reserve_id);
1082
        DeleteReserveGroup($hold->reserve_group_id);
1083
    }
1084
1069
    _koha_notify_reserve( $hold->reserve_id )
1085
    _koha_notify_reserve( $hold->reserve_id )
1070
      if ( !$transferToDo && !$already_on_shelf );
1086
      if ( !$transferToDo && !$already_on_shelf );
1071
1087
Lines 2152-2157 sub GetHoldRule { Link Here
2152
    return $sth->fetchrow_hashref();
2168
    return $sth->fetchrow_hashref();
2153
}
2169
}
2154
2170
2171
=head2 AddReserveGroup
2172
2173
    my $reserve_group_id = AddReserveGroup();
2174
2175
Creates a new reserve group and returns its ID
2176
2177
=cut
2178
2179
sub AddReserveGroup {
2180
    my $dbh = C4::Context->dbh;
2181
2182
    $dbh->do('INSERT INTO reserve_group VALUES ()');
2183
    return $dbh->last_insert_id(undef, undef, 'reserve_group', undef);
2184
}
2185
2186
=head2 DeleteReserveGroup
2187
2188
    DeleteReserveGroup($reserve_group_id);
2189
2190
Delete a reserve group. Reserves that belong to this group are not removed.
2191
2192
=cut
2193
2194
sub DeleteReserveGroup {
2195
    my ($reserve_group_id) = @_;
2196
2197
    my $dbh = C4::Context->dbh;
2198
    my $query = 'DELETE FROM reserve_group WHERE reserve_group_id = ?';
2199
    $dbh->do($query, undef, $reserve_group_id);
2200
}
2201
2202
=head2 GetReserveGroupReserves
2203
2204
    my @reserves = GetReserveGroupReserves($reserve_group_id);
2205
2206
Fetch all reserve from a reserve group.
2207
2208
=cut
2209
2210
sub GetReserveGroupReserves {
2211
    my ($reserve_group_id) = @_;
2212
2213
    my $dbh = C4::Context->dbh;
2214
2215
    my $reserves = $dbh->selectall_arrayref(q{
2216
        SELECT * FROM reserves
2217
        WHERE reserve_group_id = ?
2218
    }, { Slice => {} }, $reserve_group_id);
2219
2220
    return () unless defined $reserves;
2221
2222
    return @$reserves;
2223
}
2224
2155
=head1 AUTHOR
2225
=head1 AUTHOR
2156
2226
2157
Koha Development Team <http://koha-community.org/>
2227
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 (+2 lines)
Lines 197-202 my $strsth = Link Here
197
                    ORDER BY items.itemnumber SEPARATOR '<br/>') l_enumchron,
197
                    ORDER BY items.itemnumber SEPARATOR '<br/>') l_enumchron,
198
            GROUP_CONCAT(DISTINCT items.copynumber
198
            GROUP_CONCAT(DISTINCT items.copynumber
199
                    ORDER BY items.itemnumber SEPARATOR '<br/>') l_copynumber,
199
                    ORDER BY items.itemnumber SEPARATOR '<br/>') l_copynumber,
200
            reserves.reserve_group_id,
200
            biblio.title,
201
            biblio.title,
201
            biblio.author,
202
            biblio.author,
202
            count(DISTINCT items.itemnumber) as icount,
203
            count(DISTINCT items.itemnumber) as icount,
Lines 263-268 while ( my $data = $sth->fetchrow_hashref ) { Link Here
263
            holdingbranch   => $data->{holdingbranch},
264
            holdingbranch   => $data->{holdingbranch},
264
            homebranch      => $data->{homebranch},
265
            homebranch      => $data->{homebranch},
265
            itemnumber      => $data->{itemnumber},
266
            itemnumber      => $data->{itemnumber},
267
            reserve_group_id => $data->{reserve_group_id},
266
        }
268
        }
267
    );
269
    );
268
}
270
}
(-)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 1894-1899 CREATE TABLE `reserves` ( -- information related to holds/reserves in Koha Link Here
1894
  `suspend` BOOLEAN NOT NULL DEFAULT 0,
1894
  `suspend` BOOLEAN NOT NULL DEFAULT 0,
1895
  `suspend_until` DATETIME NULL DEFAULT NULL,
1895
  `suspend_until` DATETIME NULL DEFAULT NULL,
1896
  `itemtype` VARCHAR(10) NULL DEFAULT NULL, -- If record level hold, the optional itemtype of the item the patron is requesting
1896
  `itemtype` VARCHAR(10) NULL DEFAULT NULL, -- If record level hold, the optional itemtype of the item the patron is requesting
1897
  `reserve_group_id` int unsigned NULL DEFAULT NULL,  -- Id used on reservations spanning multiple titles
1897
  PRIMARY KEY (`reserve_id`),
1898
  PRIMARY KEY (`reserve_id`),
1898
  KEY priorityfoundidx (priority,found),
1899
  KEY priorityfoundidx (priority,found),
1899
  KEY `borrowernumber` (`borrowernumber`),
1900
  KEY `borrowernumber` (`borrowernumber`),
Lines 1905-1911 CREATE TABLE `reserves` ( -- information related to holds/reserves in Koha Link Here
1905
  CONSTRAINT `reserves_ibfk_2` FOREIGN KEY (`biblionumber`) REFERENCES `biblio` (`biblionumber`) ON DELETE CASCADE ON UPDATE CASCADE,
1906
  CONSTRAINT `reserves_ibfk_2` FOREIGN KEY (`biblionumber`) REFERENCES `biblio` (`biblionumber`) ON DELETE CASCADE ON UPDATE CASCADE,
1906
  CONSTRAINT `reserves_ibfk_3` FOREIGN KEY (`itemnumber`) REFERENCES `items` (`itemnumber`) ON DELETE CASCADE ON UPDATE CASCADE,
1907
  CONSTRAINT `reserves_ibfk_3` FOREIGN KEY (`itemnumber`) REFERENCES `items` (`itemnumber`) ON DELETE CASCADE ON UPDATE CASCADE,
1907
  CONSTRAINT `reserves_ibfk_4` FOREIGN KEY (`branchcode`) REFERENCES `branches` (`branchcode`) ON DELETE CASCADE ON UPDATE CASCADE,
1908
  CONSTRAINT `reserves_ibfk_4` FOREIGN KEY (`branchcode`) REFERENCES `branches` (`branchcode`) ON DELETE CASCADE ON UPDATE CASCADE,
1908
  CONSTRAINT `reserves_ibfk_5` FOREIGN KEY (`itemtype`) REFERENCES `itemtypes` (`itemtype`) ON DELETE CASCADE ON UPDATE CASCADE
1909
  CONSTRAINT `reserves_ibfk_5` FOREIGN KEY (`itemtype`) REFERENCES `itemtypes` (`itemtype`) ON DELETE CASCADE ON UPDATE CASCADE,
1910
  CONSTRAINT `reserves_ibfk_6` FOREIGN KEY (`reserve_group_id`) REFERENCES `reserve_group` (`reserve_group_id`) ON DELETE SET NULL ON UPDATE CASCADE
1911
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
1912
1913
--
1914
-- Table structure for table reserve_group
1915
--
1916
1917
DROP TABLE IF EXISTS `reserve_group`;
1918
CREATE TABLE `reserve_group` (
1919
  `reserve_group_id` int unsigned NOT NULL AUTO_INCREMENT,
1920
  PRIMARY KEY(`reserve_group_id`)
1909
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
1921
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
1910
1922
1911
--
1923
--
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/holds_table.inc (+3 lines)
Lines 157-162 Link Here
157
                        <input type="hidden" name="itemnumber" value="" />
157
                        <input type="hidden" name="itemnumber" value="" />
158
                    [% END %]
158
                    [% END %]
159
                [% END %]
159
                [% END %]
160
                [% IF hold.reserve_group_id %]
161
                    <div>(part of a <a href="/cgi-bin/koha/reserve/reserve-group.pl?reserve_group_id=[% hold.reserve_group_id %]" class="reserve-group">reserve group</a>)</div>
162
                [% END %]
160
            </td>
163
            </td>
161
164
162
            [% IF ( CAN_user_reserveforothers_modify_holds_priority ) %]
165
            [% IF ( CAN_user_reserveforothers_modify_holds_priority ) %]
(-)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 46-50 Link Here
46
    var CURRENT = _(" (current) ");
46
    var CURRENT = _(" (current) ");
47
    var MSG_NO_ITEMTYPE = _("No itemtype");
47
    var MSG_NO_ITEMTYPE = _("No itemtype");
48
    var MSG_CHECKOUTS_BY_ITEMTYPE = _("Number of checkouts by item type");
48
    var MSG_CHECKOUTS_BY_ITEMTYPE = _("Number of checkouts by item type");
49
    var PART_OF_A = _("(part of a %s)");
50
    var RESERVE_GROUP = _("reserve group");
49
//]]>
51
//]]>
50
</script>
52
</script>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt (+1 lines)
Lines 1101-1104 No patron matched <span class="ex">[% message | html %]</span> Link Here
1101
    [% Asset.js("js/members-menu.js") | $raw %]
1101
    [% Asset.js("js/members-menu.js") | $raw %]
1102
[% END %]
1102
[% END %]
1103
1103
1104
[% INCLUDE 'reserve-group-modal.inc' %]
1104
[% INCLUDE 'intranet-bottom.inc' %]
1105
[% INCLUDE 'intranet-bottom.inc' %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tt (+5 lines)
Lines 80-85 Link Here
80
                [% INCLUDE 'biblio-default-view.inc' biblionumber = reserveloo.biblionumber %]
80
                [% INCLUDE 'biblio-default-view.inc' biblionumber = reserveloo.biblionumber %]
81
                [% reserveloo.title | html %] [% FOREACH s IN reserveloo.subtitle %] [% s | html %][% END %]</a></p>
81
                [% reserveloo.title | html %] [% FOREACH s IN reserveloo.subtitle %] [% s | html %][% END %]</a></p>
82
                [% IF ( reserveloo.author ) %]<p> by [% reserveloo.author | html %]</p>[% END %]
82
                [% IF ( reserveloo.author ) %]<p> by [% reserveloo.author | html %]</p>[% END %]
83
                [% IF reserveloo.reserve_group_id %]
84
                    <p>(part of a <a class="reserve-group" href="/cgi-bin/koha/reserve/reserve-group.pl?reserve_group_id=[% reserveloo.reserve_group_id | html %]">reserve group</a>)</p>
85
                [% END %]
83
            </td>
86
            </td>
84
        [% ELSE %]
87
        [% ELSE %]
85
            <td>"</td>
88
            <td>"</td>
Lines 262-265 Link Here
262
    </script>
265
    </script>
263
[% END %]
266
[% END %]
264
267
268
[%# TODO: this module needs to be separated to html and js part to be included correctly %]
269
[% INCLUDE 'reserve-group-modal.inc' %]
265
[% INCLUDE 'intranet-bottom.inc' %]
270
[% INCLUDE 'intranet-bottom.inc' %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt (+1 lines)
Lines 929-932 Link Here
929
    </script>
929
    </script>
930
[% END %]
930
[% END %]
931
931
932
[% INCLUDE 'reserve-group-modal.inc' %]
932
[% INCLUDE 'intranet-bottom.inc' %]
933
[% INCLUDE 'intranet-bottom.inc' %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt (-4 / +10 lines)
Lines 231-250 Link Here
231
        <a href="#" id="clear-date-to" class="clear-date">Clear date</a>
231
        <a href="#" id="clear-date-to" class="clear-date">Clear date</a>
232
	</li>
232
	</li>
233
233
234
        [% UNLESS ( multi_hold ) %]
235
          <li> <label for="requestany">Hold next available item </label>
234
          <li> <label for="requestany">Hold next available item </label>
236
               [% IF force_hold_level == 'item' %]
235
              [% IF multi_hold %]
236
                  <input type="checkbox" id="requestany" name="requestany" value="1" />
237
              [% ELSE %]
238
                [% IF force_hold_level == 'item' %]
237
                   <input type="checkbox" id="requestany" name="request" disabled="true" />
239
                   <input type="checkbox" id="requestany" name="request" disabled="true" />
238
               [% ELSIF force_hold_level == 'record' %]
240
                [% ELSIF force_hold_level == 'record' %]
239
                   <input type="checkbox" id="requestany" checked="checked" value="Any" disabled="true"/>
241
                   <input type="checkbox" id="requestany" checked="checked" value="Any" disabled="true"/>
240
                   <input type="hidden" name="request" value="Any"/>
242
                   <input type="hidden" name="request" value="Any"/>
241
               [% ELSE %]
243
                [% ELSE %]
242
                   <input type="checkbox" id="requestany" name="request" checked="checked" value="Any" />
244
                   <input type="checkbox" id="requestany" name="request" checked="checked" value="Any" />
243
                [% END %]
245
                [% END %]
246
              [% END %]
244
               <input type="hidden" name="biblioitem" value="[% biblioitemnumber | html %]" />
247
               <input type="hidden" name="biblioitem" value="[% biblioitemnumber | html %]" />
245
               <input type="hidden" name="alreadyreserved" value="[% alreadyreserved | html %]" />
248
               <input type="hidden" name="alreadyreserved" value="[% alreadyreserved | html %]" />
246
          </li>
249
          </li>
247
250
251
        [% UNLESS ( multi_hold ) %]
248
          [% IF remaining_holds_for_record > 1 %]
252
          [% IF remaining_holds_for_record > 1 %]
249
              <li>
253
              <li>
250
                   <label for="holds_to_place_count">Holds to place (count)</label>
254
                   <label for="holds_to_place_count">Holds to place (count)</label>
Lines 872-875 Link Here
872
    </script>
876
    </script>
873
[% END %]
877
[% END %]
874
878
879
[% INCLUDE 'reserve-group-modal.inc' %]
880
875
[% INCLUDE 'intranet-bottom.inc' %]
881
[% 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.escapeHtml() + "</span>"
42
                                title += " - <span class='" + span_class + "'>" + oObj.itemnotes.escapeHtml() + "</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 = Koha::Patrons->find( $borrowernumber );
55
my $borrower = Koha::Patrons->find( $borrowernumber );
55
$borrower = $borrower->unblessed if $borrower;
56
$borrower = $borrower->unblessed if $borrower;
Lines 72-77 my $found; Link Here
72
73
73
if ( $type eq 'str8' && $borrower ) {
74
if ( $type eq 'str8' && $borrower ) {
74
75
76
    my $reserve_group_id;
77
    if ($multi_hold && $requestany) {
78
        $reserve_group_id = AddReserveGroup();
79
    }
80
75
    foreach my $biblionumber ( keys %bibinfos ) {
81
    foreach my $biblionumber ( keys %bibinfos ) {
76
        my $count = @bibitems;
82
        my $count = @bibitems;
77
        @bibitems = sort @bibitems;
83
        @bibitems = sort @bibitems;
Lines 95-102 if ( $type eq 'str8' && $borrower ) { Link Here
95
101
96
        if ($multi_hold) {
102
        if ($multi_hold) {
97
            my $bibinfo = $bibinfos{$biblionumber};
103
            my $bibinfo = $bibinfos{$biblionumber};
98
            AddReserve($branch,$borrower->{'borrowernumber'},$biblionumber,[$biblionumber],
104
            AddReserve($branch, $borrower->{'borrowernumber'}, $biblionumber,
99
                       $bibinfo->{rank},$startdate,$expirationdate,$notes,$bibinfo->{title},$checkitem,$found);
105
                [$biblionumber], $bibinfo->{rank}, $startdate, $expirationdate,
106
                $notes, $bibinfo->{title}, $checkitem, $found, $itemtype,
107
                $reserve_group_id);
100
        } else {
108
        } else {
101
            # place a request on 1st available
109
            # place a request on 1st available
102
            for ( my $i = 0 ; $i < $holds_to_place_count ; $i++ ) {
110
            for ( my $i = 0 ; $i < $holds_to_place_count ; $i++ ) {
(-)a/reserve/request.pl (+1 lines)
Lines 597-602 foreach my $biblionumber (@biblionumbers) { Link Here
597
        $reserve{itemtype}         = $res->itemtype();
597
        $reserve{itemtype}         = $res->itemtype();
598
        $reserve{branchcode}       = $res->branchcode();
598
        $reserve{branchcode}       = $res->branchcode();
599
        $reserve{object}           = $res;
599
        $reserve{object}           = $res;
600
        $reserve{'reserve_group_id'} = $res->reserve_group_id;
600
601
601
        push( @reserveloop, \%reserve );
602
        push( @reserveloop, \%reserve );
602
    }
603
    }
(-)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 102-107 while ( my $h = $holds_rs->next() ) { Link Here
102
        waiting_here   => $h->branch()->branchcode() eq $branch,
102
        waiting_here   => $h->branch()->branchcode() eq $branch,
103
        priority       => $h->priority(),
103
        priority       => $h->priority(),
104
        itemtype_limit => $itemtype_limit,
104
        itemtype_limit => $itemtype_limit,
105
        reserve_group_id => $h->reserve_group_id,
105
        subtitle       => GetRecordValue(
106
        subtitle       => GetRecordValue(
106
            'subtitle',
107
            'subtitle',
107
            GetMarcBiblio({ biblionumber => $biblionumber }),
108
            GetMarcBiblio({ biblionumber => $biblionumber }),
108
- 

Return to bug 15516