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 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
    $hold->set_waiting() if $found eq 'W';
221
    $hold->set_waiting() if $found eq 'W';
Lines 1078-1083 sub ModReserveAffect { Link Here
1078
    $hold->itemnumber($itemnumber);
1084
    $hold->itemnumber($itemnumber);
1079
    $hold->set_waiting($transferToDo);
1085
    $hold->set_waiting($transferToDo);
1080
1086
1087
    if ($hold->reserve_group_id) {
1088
        # Delete other reserves from same group
1089
        $dbh->do(q{
1090
            DELETE FROM reserves
1091
            WHERE reserve_group_id = ?
1092
              AND reserve_id != ?
1093
        }, undef, $hold->reserve_group_id, $hold->reserve_id);
1094
        DeleteReserveGroup($hold->reserve_group_id);
1095
    }
1096
1081
    _koha_notify_reserve( $hold->reserve_id )
1097
    _koha_notify_reserve( $hold->reserve_id )
1082
      if ( !$transferToDo && !$already_on_shelf );
1098
      if ( !$transferToDo && !$already_on_shelf );
1083
1099
Lines 2165-2170 sub GetHoldRule { Link Here
2165
    return $sth->fetchrow_hashref();
2181
    return $sth->fetchrow_hashref();
2166
}
2182
}
2167
2183
2184
=head2 AddReserveGroup
2185
2186
    my $reserve_group_id = AddReserveGroup();
2187
2188
Creates a new reserve group and returns its ID
2189
2190
=cut
2191
2192
sub AddReserveGroup {
2193
    my $dbh = C4::Context->dbh;
2194
2195
    $dbh->do('INSERT INTO reserve_group VALUES ()');
2196
    return $dbh->last_insert_id(undef, undef, 'reserve_group', undef);
2197
}
2198
2199
=head2 DeleteReserveGroup
2200
2201
    DeleteReserveGroup($reserve_group_id);
2202
2203
Delete a reserve group. Reserves that belong to this group are not removed.
2204
2205
=cut
2206
2207
sub DeleteReserveGroup {
2208
    my ($reserve_group_id) = @_;
2209
2210
    my $dbh = C4::Context->dbh;
2211
    my $query = 'DELETE FROM reserve_group WHERE reserve_group_id = ?';
2212
    $dbh->do($query, undef, $reserve_group_id);
2213
}
2214
2215
=head2 GetReserveGroupReserves
2216
2217
    my @reserves = GetReserveGroupReserves($reserve_group_id);
2218
2219
Fetch all reserve from a reserve group.
2220
2221
=cut
2222
2223
sub GetReserveGroupReserves {
2224
    my ($reserve_group_id) = @_;
2225
2226
    my $dbh = C4::Context->dbh;
2227
2228
    my $reserves = $dbh->selectall_arrayref(q{
2229
        SELECT * FROM reserves
2230
        WHERE reserve_group_id = ?
2231
    }, { Slice => {} }, $reserve_group_id);
2232
2233
    return () unless defined $reserves;
2234
2235
    return @$reserves;
2236
}
2237
2168
=head1 AUTHOR
2238
=head1 AUTHOR
2169
2239
2170
Koha Development Team <http://koha-community.org/>
2240
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.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 1882-1887 CREATE TABLE `reserves` ( -- information related to holds/reserves in Koha Link Here
1882
  `suspend` BOOLEAN NOT NULL DEFAULT 0,
1882
  `suspend` BOOLEAN NOT NULL DEFAULT 0,
1883
  `suspend_until` DATETIME NULL DEFAULT NULL,
1883
  `suspend_until` DATETIME NULL DEFAULT NULL,
1884
  `itemtype` VARCHAR(10) NULL DEFAULT NULL, -- If record level hold, the optional itemtype of the item the patron is requesting
1884
  `itemtype` VARCHAR(10) NULL DEFAULT NULL, -- If record level hold, the optional itemtype of the item the patron is requesting
1885
  `reserve_group_id` int unsigned NULL DEFAULT NULL,  -- Id used on reservations spanning multiple titles
1885
  PRIMARY KEY (`reserve_id`),
1886
  PRIMARY KEY (`reserve_id`),
1886
  KEY priorityfoundidx (priority,found),
1887
  KEY priorityfoundidx (priority,found),
1887
  KEY `borrowernumber` (`borrowernumber`),
1888
  KEY `borrowernumber` (`borrowernumber`),
Lines 1893-1899 CREATE TABLE `reserves` ( -- information related to holds/reserves in Koha Link Here
1893
  CONSTRAINT `reserves_ibfk_2` FOREIGN KEY (`biblionumber`) REFERENCES `biblio` (`biblionumber`) ON DELETE CASCADE ON UPDATE CASCADE,
1894
  CONSTRAINT `reserves_ibfk_2` FOREIGN KEY (`biblionumber`) REFERENCES `biblio` (`biblionumber`) ON DELETE CASCADE ON UPDATE CASCADE,
1894
  CONSTRAINT `reserves_ibfk_3` FOREIGN KEY (`itemnumber`) REFERENCES `items` (`itemnumber`) ON DELETE CASCADE ON UPDATE CASCADE,
1895
  CONSTRAINT `reserves_ibfk_3` FOREIGN KEY (`itemnumber`) REFERENCES `items` (`itemnumber`) ON DELETE CASCADE ON UPDATE CASCADE,
1895
  CONSTRAINT `reserves_ibfk_4` FOREIGN KEY (`branchcode`) REFERENCES `branches` (`branchcode`) ON DELETE CASCADE ON UPDATE CASCADE,
1896
  CONSTRAINT `reserves_ibfk_4` FOREIGN KEY (`branchcode`) REFERENCES `branches` (`branchcode`) ON DELETE CASCADE ON UPDATE CASCADE,
1896
  CONSTRAINT `reserves_ibfk_5` FOREIGN KEY (`itemtype`) REFERENCES `itemtypes` (`itemtype`) 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_6` FOREIGN KEY (`reserve_group_id`) REFERENCES `reserve_group` (`reserve_group_id`) ON DELETE SET NULL ON UPDATE CASCADE
1899
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
1900
1901
--
1902
-- Table structure for table reserve_group
1903
--
1904
1905
DROP TABLE IF EXISTS `reserve_group`;
1906
CREATE TABLE `reserve_group` (
1907
  `reserve_group_id` int unsigned NOT NULL AUTO_INCREMENT,
1908
  PRIMARY KEY(`reserve_group_id`)
1897
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
1909
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
1898
1910
1899
--
1911
--
(-)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 1131-1134 Link Here
1131
    [% Asset.js("js/members-menu.js") | $raw %]
1131
    [% Asset.js("js/members-menu.js") | $raw %]
1132
[% END %]
1132
[% END %]
1133
1133
1134
[% INCLUDE 'reserve-group-modal.inc' %]
1134
[% INCLUDE 'intranet-bottom.inc' %]
1135
[% INCLUDE 'intranet-bottom.inc' %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tt (+5 lines)
Lines 79-84 Link Here
79
                [% INCLUDE 'biblio-default-view.inc' biblionumber = reserveloo.biblionumber %]
79
                [% INCLUDE 'biblio-default-view.inc' biblionumber = reserveloo.biblionumber %]
80
                [% reserveloo.title | html %] [% FOREACH s IN reserveloo.subtitle %] [% s | html %][% END %]</a></p>
80
                [% reserveloo.title | html %] [% FOREACH s IN reserveloo.subtitle %] [% s | html %][% END %]</a></p>
81
                [% IF ( reserveloo.author ) %]<p> by [% reserveloo.author | html %]</p>[% END %]
81
                [% IF ( reserveloo.author ) %]<p> by [% reserveloo.author | html %]</p>[% END %]
82
                [% IF reserveloo.reserve_group_id %]
83
                    <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>
84
                [% END %]
82
            </td>
85
            </td>
83
        [% ELSE %]
86
        [% ELSE %]
84
            <td>"</td>
87
            <td>"</td>
Lines 303-306 Link Here
303
    </script>
306
    </script>
304
[% END %]
307
[% END %]
305
308
309
[%# TODO: this module needs to be separated to html and js part to be included correctly %]
310
[% INCLUDE 'reserve-group-modal.inc' %]
306
[% INCLUDE 'intranet-bottom.inc' %]
311
[% 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 243-262 Link Here
243
        <a href="#" id="clear-date-to" class="clear-date">Clear date</a>
243
        <a href="#" id="clear-date-to" class="clear-date">Clear date</a>
244
	</li>
244
	</li>
245
245
246
        [% UNLESS ( multi_hold ) %]
247
          <li> <label for="requestany">Hold next available item </label>
246
          <li> <label for="requestany">Hold next available item </label>
248
               [% IF force_hold_level == 'item' %]
247
              [% IF multi_hold %]
248
                  <input type="checkbox" id="requestany" name="requestany" value="1" />
249
              [% ELSE %]
250
                [% IF force_hold_level == 'item' %]
249
                   <input type="checkbox" id="requestany" name="request" disabled="true" />
251
                   <input type="checkbox" id="requestany" name="request" disabled="true" />
250
               [% ELSIF force_hold_level == 'record' %]
252
                [% ELSIF force_hold_level == 'record' %]
251
                   <input type="checkbox" id="requestany" checked="checked" value="Any" disabled="true"/>
253
                   <input type="checkbox" id="requestany" checked="checked" value="Any" disabled="true"/>
252
                   <input type="hidden" name="request" value="Any"/>
254
                   <input type="hidden" name="request" value="Any"/>
253
               [% ELSE %]
255
                [% ELSE %]
254
                   <input type="checkbox" id="requestany" name="request" checked="checked" value="Any" />
256
                   <input type="checkbox" id="requestany" name="request" checked="checked" value="Any" />
255
                [% END %]
257
                [% END %]
258
              [% END %]
256
               <input type="hidden" name="biblioitem" value="[% biblioitemnumber | html %]" />
259
               <input type="hidden" name="biblioitem" value="[% biblioitemnumber | html %]" />
257
               <input type="hidden" name="alreadyreserved" value="[% alreadyreserved | html %]" />
260
               <input type="hidden" name="alreadyreserved" value="[% alreadyreserved | html %]" />
258
          </li>
261
          </li>
259
262
263
        [% UNLESS ( multi_hold ) %]
260
          [% IF remaining_holds_for_record > 1 %]
264
          [% IF remaining_holds_for_record > 1 %]
261
              <li>
265
              <li>
262
                   <label for="holds_to_place_count">Holds to place (count)</label>
266
                   <label for="holds_to_place_count">Holds to place (count)</label>
Lines 914-917 Link Here
914
    </script>
918
    </script>
915
[% END %]
919
[% END %]
916
920
921
[% INCLUDE 'reserve-group-modal.inc' %]
922
917
[% INCLUDE 'intranet-bottom.inc' %]
923
[% 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 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 101-108 if ( $type eq 'str8' && $borrower ) { Link Here
101
        } elsif ($multi_hold) {
107
        } elsif ($multi_hold) {
102
            my $bibinfo = $bibinfos{$biblionumber};
108
            my $bibinfo = $bibinfos{$biblionumber};
103
            if ( CanBookBeReserved($borrower->{'borrowernumber'}, $biblionumber)->{status} eq 'OK' ) {
109
            if ( CanBookBeReserved($borrower->{'borrowernumber'}, $biblionumber)->{status} eq 'OK' ) {
104
                AddReserve($branch,$borrower->{'borrowernumber'},$biblionumber,[$biblionumber],
110
                AddReserve($branch, $borrower->{'borrowernumber'}, $biblionumber,
105
                           $bibinfo->{rank},$startdate,$expirationdate,$notes,$bibinfo->{title},$checkitem,$found);
111
                    [$biblionumber], $bibinfo->{rank}, $startdate, $expirationdate,
112
                    $notes, $bibinfo->{title}, $checkitem, $found, $itemtype,
113
                    $reserve_group_id);
106
            }
114
            }
107
        } else {
115
        } else {
108
            # place a request on 1st available
116
            # place a request on 1st available
(-)a/reserve/request.pl (+1 lines)
Lines 618-623 foreach my $biblionumber (@biblionumbers) { Link Here
618
        $reserve{itemtype}         = $res->itemtype();
618
        $reserve{itemtype}         = $res->itemtype();
619
        $reserve{branchcode}       = $res->branchcode();
619
        $reserve{branchcode}       = $res->branchcode();
620
        $reserve{object}           = $res;
620
        $reserve{object}           = $res;
621
        $reserve{'reserve_group_id'} = $res->reserve_group_id;
621
622
622
        push( @reserveloop, \%reserve );
623
        push( @reserveloop, \%reserve );
623
    }
624
    }
(-)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