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

(-)a/C4/Reserves.pm (-1 / +71 lines)
Lines 137-142 BEGIN { Link Here
137
        IsItemOnHoldAndFound
137
        IsItemOnHoldAndFound
138
138
139
        GetMaxPatronHoldsForRecord
139
        GetMaxPatronHoldsForRecord
140
141
        &AddReserveGroup
142
        &DeleteReserveGroup
143
        &GetReserveGroupReserves
140
    );
144
    );
141
    @EXPORT_OK = qw( MergeHolds );
145
    @EXPORT_OK = qw( MergeHolds );
142
}
146
}
Lines 162-168 sub AddReserve { Link Here
162
    my (
166
    my (
163
        $branch,   $borrowernumber, $biblionumber, $bibitems,
167
        $branch,   $borrowernumber, $biblionumber, $bibitems,
164
        $priority, $resdate,        $expdate,      $notes,
168
        $priority, $resdate,        $expdate,      $notes,
165
        $title,    $checkitem,      $found,        $itemtype
169
        $title,    $checkitem,      $found,        $itemtype,
170
        $reserve_group_id
166
    ) = @_;
171
    ) = @_;
167
172
168
    $resdate = output_pref( { str => dt_from_string( $resdate ), dateonly => 1, dateformat => 'iso' })
173
    $resdate = output_pref( { str => dt_from_string( $resdate ), dateonly => 1, dateformat => 'iso' })
Lines 211-216 sub AddReserve { Link Here
211
            expirationdate => $expdate,
216
            expirationdate => $expdate,
212
            itemtype       => $itemtype,
217
            itemtype       => $itemtype,
213
            item_level_hold => $checkitem ? 1 : 0,
218
            item_level_hold => $checkitem ? 1 : 0,
219
            reserve_group_id => $reserve_group_id,
214
        }
220
        }
215
    )->store();
221
    )->store();
216
    $hold->set_waiting() if $found eq 'W';
222
    $hold->set_waiting() if $found eq 'W';
Lines 1075-1080 sub ModReserveAffect { Link Here
1075
    $hold->itemnumber($itemnumber);
1081
    $hold->itemnumber($itemnumber);
1076
    $hold->set_waiting($transferToDo);
1082
    $hold->set_waiting($transferToDo);
1077
1083
1084
    if ($hold->reserve_group_id) {
1085
        # Delete other reserves from same group
1086
        $dbh->do(q{
1087
            DELETE FROM reserves
1088
            WHERE reserve_group_id = ?
1089
              AND reserve_id != ?
1090
        }, undef, $hold->reserve_group_id, $hold->reserve_id);
1091
        DeleteReserveGroup($hold->reserve_group_id);
1092
    }
1093
1078
    _koha_notify_reserve( $hold->reserve_id )
1094
    _koha_notify_reserve( $hold->reserve_id )
1079
      if ( !$transferToDo && !$already_on_shelf );
1095
      if ( !$transferToDo && !$already_on_shelf );
1080
1096
Lines 2174-2179 sub GetHoldRule { Link Here
2174
    return $sth->fetchrow_hashref();
2190
    return $sth->fetchrow_hashref();
2175
}
2191
}
2176
2192
2193
=head2 AddReserveGroup
2194
2195
    my $reserve_group_id = AddReserveGroup();
2196
2197
Creates a new reserve group and returns its ID
2198
2199
=cut
2200
2201
sub AddReserveGroup {
2202
    my $dbh = C4::Context->dbh;
2203
2204
    $dbh->do('INSERT INTO reserve_group VALUES ()');
2205
    return $dbh->last_insert_id(undef, undef, 'reserve_group', undef);
2206
}
2207
2208
=head2 DeleteReserveGroup
2209
2210
    DeleteReserveGroup($reserve_group_id);
2211
2212
Delete a reserve group. Reserves that belong to this group are not removed.
2213
2214
=cut
2215
2216
sub DeleteReserveGroup {
2217
    my ($reserve_group_id) = @_;
2218
2219
    my $dbh = C4::Context->dbh;
2220
    my $query = 'DELETE FROM reserve_group WHERE reserve_group_id = ?';
2221
    $dbh->do($query, undef, $reserve_group_id);
2222
}
2223
2224
=head2 GetReserveGroupReserves
2225
2226
    my @reserves = GetReserveGroupReserves($reserve_group_id);
2227
2228
Fetch all reserve from a reserve group.
2229
2230
=cut
2231
2232
sub GetReserveGroupReserves {
2233
    my ($reserve_group_id) = @_;
2234
2235
    my $dbh = C4::Context->dbh;
2236
2237
    my $reserves = $dbh->selectall_arrayref(q{
2238
        SELECT * FROM reserves
2239
        WHERE reserve_group_id = ?
2240
    }, { Slice => {} }, $reserve_group_id);
2241
2242
    return () unless defined $reserves;
2243
2244
    return @$reserves;
2245
}
2246
2177
=head1 AUTHOR
2247
=head1 AUTHOR
2178
2248
2179
Koha Development Team <http://koha-community.org/>
2249
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 '|') l_enumchron,
197
                    ORDER BY items.itemnumber SEPARATOR '|') l_enumchron,
198
            GROUP_CONCAT(DISTINCT items.copynumber
198
            GROUP_CONCAT(DISTINCT items.copynumber
199
                    ORDER BY items.itemnumber SEPARATOR '|') l_copynumber,
199
                    ORDER BY items.itemnumber SEPARATOR '|') l_copynumber,
200
            reserves.reserve_group_id,
200
            biblio.title,
201
            biblio.title,
201
            biblio.subtitle,
202
            biblio.subtitle,
202
            biblio.medium,
203
            biblio.medium,
Lines 268-273 while ( my $data = $sth->fetchrow_hashref ) { Link Here
268
            holdingbranch   => $data->{holdingbranch},
269
            holdingbranch   => $data->{holdingbranch},
269
            homebranch      => $data->{homebranch},
270
            homebranch      => $data->{homebranch},
270
            itemnumber      => $data->{itemnumber},
271
            itemnumber      => $data->{itemnumber},
272
            reserve_group_id => $data->{reserve_group_id},
271
        }
273
        }
272
    );
274
    );
273
}
275
}
(-)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 1817-1822 CREATE TABLE `reserves` ( -- information related to holds/reserves in Koha Link Here
1817
  `suspend_until` DATETIME NULL DEFAULT NULL,
1817
  `suspend_until` DATETIME NULL DEFAULT NULL,
1818
  `itemtype` VARCHAR(10) NULL DEFAULT NULL, -- If record level hold, the optional itemtype of the item the patron is requesting
1818
  `itemtype` VARCHAR(10) NULL DEFAULT NULL, -- If record level hold, the optional itemtype of the item the patron is requesting
1819
  `item_level_hold` BOOLEAN NOT NULL DEFAULT 0, -- Is the hpld placed at item level
1819
  `item_level_hold` BOOLEAN NOT NULL DEFAULT 0, -- Is the hpld placed at item level
1820
  `reserve_group_id` int unsigned NULL DEFAULT NULL,  -- Id used on reservations spanning multiple titles
1820
  PRIMARY KEY (`reserve_id`),
1821
  PRIMARY KEY (`reserve_id`),
1821
  KEY priorityfoundidx (priority,found),
1822
  KEY priorityfoundidx (priority,found),
1822
  KEY `borrowernumber` (`borrowernumber`),
1823
  KEY `borrowernumber` (`borrowernumber`),
Lines 1828-1834 CREATE TABLE `reserves` ( -- information related to holds/reserves in Koha Link Here
1828
  CONSTRAINT `reserves_ibfk_2` FOREIGN KEY (`biblionumber`) REFERENCES `biblio` (`biblionumber`) ON DELETE CASCADE ON UPDATE CASCADE,
1829
  CONSTRAINT `reserves_ibfk_2` FOREIGN KEY (`biblionumber`) REFERENCES `biblio` (`biblionumber`) ON DELETE CASCADE ON UPDATE CASCADE,
1829
  CONSTRAINT `reserves_ibfk_3` FOREIGN KEY (`itemnumber`) REFERENCES `items` (`itemnumber`) ON DELETE CASCADE ON UPDATE CASCADE,
1830
  CONSTRAINT `reserves_ibfk_3` FOREIGN KEY (`itemnumber`) REFERENCES `items` (`itemnumber`) ON DELETE CASCADE ON UPDATE CASCADE,
1830
  CONSTRAINT `reserves_ibfk_4` FOREIGN KEY (`branchcode`) REFERENCES `branches` (`branchcode`) ON DELETE CASCADE ON UPDATE CASCADE,
1831
  CONSTRAINT `reserves_ibfk_4` FOREIGN KEY (`branchcode`) REFERENCES `branches` (`branchcode`) ON DELETE CASCADE ON UPDATE CASCADE,
1831
  CONSTRAINT `reserves_ibfk_5` FOREIGN KEY (`itemtype`) REFERENCES `itemtypes` (`itemtype`) ON DELETE CASCADE ON UPDATE CASCADE
1832
  CONSTRAINT `reserves_ibfk_5` FOREIGN KEY (`itemtype`) REFERENCES `itemtypes` (`itemtype`) ON DELETE CASCADE ON UPDATE CASCADE,
1833
  CONSTRAINT `reserves_ibfk_6` FOREIGN KEY (`reserve_group_id`) REFERENCES `reserve_group` (`reserve_group_id`) ON DELETE SET NULL ON UPDATE CASCADE
1834
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
1835
1836
--
1837
-- Table structure for table reserve_group
1838
--
1839
1840
DROP TABLE IF EXISTS `reserve_group`;
1841
CREATE TABLE `reserve_group` (
1842
  `reserve_group_id` int unsigned NOT NULL AUTO_INCREMENT,
1843
  PRIMARY KEY(`reserve_group_id`)
1832
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
1844
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
1833
1845
1834
--
1846
--
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/holds_table.inc (+3 lines)
Lines 164-169 Link Here
164
                        <input type="hidden" name="itemnumber" value="" />
164
                        <input type="hidden" name="itemnumber" value="" />
165
                    [% END %]
165
                    [% END %]
166
                [% END %]
166
                [% END %]
167
                [% IF hold.reserve_group_id %]
168
                    <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>
169
                [% END %]
167
            </td>
170
            </td>
168
171
169
            [% IF ( CAN_user_reserveforothers_modify_holds_priority ) %]
172
            [% 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/modules/circ/circulation.tt (+1 lines)
Lines 1106-1109 Link Here
1106
    [% Asset.js("js/members-menu.js") | $raw %]
1106
    [% Asset.js("js/members-menu.js") | $raw %]
1107
[% END %]
1107
[% END %]
1108
1108
1109
[% INCLUDE 'reserve-group-modal.inc' %]
1109
[% INCLUDE 'intranet-bottom.inc' %]
1110
[% 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-title.inc' biblio=reserveloo %]
80
                    [% INCLUDE 'biblio-title.inc' biblio=reserveloo %]
81
                </a></p>
81
                </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 304-307 Link Here
304
    </script>
307
    </script>
305
[% END %]
308
[% END %]
306
309
310
[%# TODO: this module needs to be separated to html and js part to be included correctly %]
311
[% INCLUDE 'reserve-group-modal.inc' %]
307
[% INCLUDE 'intranet-bottom.inc' %]
312
[% INCLUDE 'intranet-bottom.inc' %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt (+1 lines)
Lines 957-960 Link Here
957
    </script>
957
    </script>
958
[% END %]
958
[% END %]
959
959
960
[% INCLUDE 'reserve-group-modal.inc' %]
960
[% INCLUDE 'intranet-bottom.inc' %]
961
[% INCLUDE 'intranet-bottom.inc' %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt (-4 / +10 lines)
Lines 259-279 Link Here
259
                                <a href="#" id="clear-date-to" class="clear-date">Clear date</a>
259
                                <a href="#" id="clear-date-to" class="clear-date">Clear date</a>
260
                            </li>
260
                            </li>
261
261
262
                            [% UNLESS ( multi_hold ) %]
263
                                <li>
262
                                <li>
264
                                    <label for="requestany">Hold next available item </label>
263
                                    <label for="requestany">Hold next available item </label>
265
                                    [% IF force_hold_level == 'item' %]
264
                                    [% IF multi_hold %]
265
                                        <input type="checkbox" id="requestany" name="requestany" value="1" />
266
                                    [% ELSE %]
267
                                      [% IF force_hold_level == 'item' %]
266
                                        <input type="checkbox" id="requestany" name="request" disabled="true" />
268
                                        <input type="checkbox" id="requestany" name="request" disabled="true" />
267
                                    [% ELSIF force_hold_level == 'record' %]
269
                                      [% ELSIF force_hold_level == 'record' %]
268
                                        <input type="checkbox" id="requestany" checked="checked" value="Any" disabled="true"/>
270
                                        <input type="checkbox" id="requestany" checked="checked" value="Any" disabled="true"/>
269
                                        <input type="hidden" name="request" value="Any"/>
271
                                        <input type="hidden" name="request" value="Any"/>
270
                                    [% ELSE %]
272
                                      [% ELSE %]
271
                                        <input type="checkbox" id="requestany" name="request" checked="checked" value="Any" />
273
                                        <input type="checkbox" id="requestany" name="request" checked="checked" value="Any" />
274
                                      [% END %]
272
                                    [% END %]
275
                                    [% END %]
273
                                    <input type="hidden" name="biblioitem" value="[% biblioitemnumber | html %]" />
276
                                    <input type="hidden" name="biblioitem" value="[% biblioitemnumber | html %]" />
274
                                    <input type="hidden" name="alreadyreserved" value="[% alreadyreserved | html %]" />
277
                                    <input type="hidden" name="alreadyreserved" value="[% alreadyreserved | html %]" />
275
                                </li>
278
                                </li>
276
279
280
                            [% UNLESS multi_hold %]
277
                                [% IF remaining_holds_for_record > 1 %]
281
                                [% IF remaining_holds_for_record > 1 %]
278
                                    <li>
282
                                    <li>
279
                                        <label for="holds_to_place_count">Holds to place (count)</label>
283
                                        <label for="holds_to_place_count">Holds to place (count)</label>
Lines 971-974 Link Here
971
    </script>
975
    </script>
972
[% END %]
976
[% END %]
973
977
978
[% INCLUDE 'reserve-group-modal.inc' %]
979
974
[% INCLUDE 'intranet-bottom.inc' %]
980
[% 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 44-49 $(document).ready(function() { Link Here
44
                                title += " - <span class='" + span_class + "'>" + oObj.itemnotes.escapeHtml() + "</span>"
44
                                title += " - <span class='" + span_class + "'>" + oObj.itemnotes.escapeHtml() + "</span>"
45
                            }
45
                            }
46
46
47
                            if (oObj.reserve_group_id) {
48
                              title += '<br>';
49
                              var link = '<a class="reserve-group" href="/cgi-bin/koha/reserve/reserve-group.pl?reserve_group_id=' + oObj.reserve_group_id + '">' + RESERVE_GROUP +'</a>'
50
                              title += '<span>' + PART_OF_A.format(link) + '</span>';
51
                            }
52
47
                            return title;
53
                            return title;
48
                        }
54
                        }
49
                    },
55
                    },
(-)a/reserve/placerequest.pl (-1 / +8 lines)
Lines 52-57 my $title = $input->param('title'); Link Here
52
my $checkitem      = $input->param('checkitem');
52
my $checkitem      = $input->param('checkitem');
53
my $expirationdate = $input->param('expiration_date');
53
my $expirationdate = $input->param('expiration_date');
54
my $itemtype       = $input->param('itemtype') || undef;
54
my $itemtype       = $input->param('itemtype') || undef;
55
my $requestany     = $input->param('requestany');
55
56
56
my $borrower = Koha::Patrons->find( $borrowernumber );
57
my $borrower = Koha::Patrons->find( $borrowernumber );
57
$borrower = $borrower->unblessed if $borrower;
58
$borrower = $borrower->unblessed if $borrower;
Lines 74-79 my $found; Link Here
74
75
75
if ( $type eq 'str8' && $borrower ) {
76
if ( $type eq 'str8' && $borrower ) {
76
77
78
    my $reserve_group_id;
79
    if ($multi_hold && $requestany) {
80
        $reserve_group_id = AddReserveGroup();
81
    }
82
77
    foreach my $biblionumber ( keys %bibinfos ) {
83
    foreach my $biblionumber ( keys %bibinfos ) {
78
        my $count = @bibitems;
84
        my $count = @bibitems;
79
        @bibitems = sort @bibitems;
85
        @bibitems = sort @bibitems;
Lines 109-115 if ( $type eq 'str8' && $borrower ) { Link Here
109
            my $bibinfo = $bibinfos{$biblionumber};
115
            my $bibinfo = $bibinfos{$biblionumber};
110
            if ( $can_override || CanBookBeReserved($borrower->{'borrowernumber'}, $biblionumber)->{status} eq 'OK' ) {
116
            if ( $can_override || CanBookBeReserved($borrower->{'borrowernumber'}, $biblionumber)->{status} eq 'OK' ) {
111
                AddReserve($branch,$borrower->{'borrowernumber'},$biblionumber,[$biblionumber],
117
                AddReserve($branch,$borrower->{'borrowernumber'},$biblionumber,[$biblionumber],
112
                           $bibinfo->{rank},$startdate,$expirationdate,$notes,$bibinfo->{title},$checkitem,$found);
118
                           $bibinfo->{rank},$startdate,$expirationdate,$notes,$bibinfo->{title},$checkitem,$found,
119
                           $itemtype, $reserve_group_id);
113
            }
120
            }
114
        } else {
121
        } else {
115
            # place a request on 1st available
122
            # place a request on 1st available
(-)a/reserve/request.pl (+1 lines)
Lines 609-614 foreach my $biblionumber (@biblionumbers) { Link Here
609
        $reserve{itemtype}         = $res->itemtype();
609
        $reserve{itemtype}         = $res->itemtype();
610
        $reserve{branchcode}       = $res->branchcode();
610
        $reserve{branchcode}       = $res->branchcode();
611
        $reserve{object}           = $res;
611
        $reserve{object}           = $res;
612
        $reserve{'reserve_group_id'} = $res->reserve_group_id;
612
613
613
        push( @reserveloop, \%reserve );
614
        push( @reserveloop, \%reserve );
614
    }
615
    }
(-)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 108-113 while ( my $h = $holds_rs->next() ) { Link Here
108
        waiting_here   => $h->branch()->branchcode() eq $branch,
108
        waiting_here   => $h->branch()->branchcode() eq $branch,
109
        priority       => $h->priority(),
109
        priority       => $h->priority(),
110
        itemtype_limit => $itemtype_limit,
110
        itemtype_limit => $itemtype_limit,
111
        reserve_group_id => $h->reserve_group_id,
111
        reservedate_formatted => $h->reservedate() ? output_pref(
112
        reservedate_formatted => $h->reservedate() ? output_pref(
112
            { dt => dt_from_string( $h->reservedate() ), dateonly => 1 }
113
            { dt => dt_from_string( $h->reservedate() ), dateonly => 1 }
113
          )
114
          )
114
- 

Return to bug 15516