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

(-)a/C4/Reserves.pm (-1 / +71 lines)
Lines 140-145 BEGIN { Link Here
140
        IsItemOnHoldAndFound
140
        IsItemOnHoldAndFound
141
141
142
        GetMaxPatronHoldsForRecord
142
        GetMaxPatronHoldsForRecord
143
144
        &AddReserveGroup
145
        &DeleteReserveGroup
146
        &GetReserveGroupReserves
143
    );
147
    );
144
    @EXPORT_OK = qw( MergeHolds );
148
    @EXPORT_OK = qw( MergeHolds );
145
}
149
}
Lines 165-171 sub AddReserve { Link Here
165
    my (
169
    my (
166
        $branch,   $borrowernumber, $biblionumber, $bibitems,
170
        $branch,   $borrowernumber, $biblionumber, $bibitems,
167
        $priority, $resdate,        $expdate,      $notes,
171
        $priority, $resdate,        $expdate,      $notes,
168
        $title,    $checkitem,      $found,        $itemtype
172
        $title,    $checkitem,      $found,        $itemtype,
173
        $reserve_group_id
169
    ) = @_;
174
    ) = @_;
170
175
171
    $resdate = output_pref( { str => dt_from_string( $resdate ), dateonly => 1, dateformat => 'iso' })
176
    $resdate = output_pref( { str => dt_from_string( $resdate ), dateonly => 1, dateformat => 'iso' })
Lines 203-208 sub AddReserve { Link Here
203
            waitingdate    => $waitingdate,
208
            waitingdate    => $waitingdate,
204
            expirationdate => $expdate,
209
            expirationdate => $expdate,
205
            itemtype       => $itemtype,
210
            itemtype       => $itemtype,
211
            reserve_group_id => $reserve_group_id,
206
        }
212
        }
207
    )->store();
213
    )->store();
208
214
Lines 1010-1015 sub ModReserveAffect { Link Here
1010
    $hold->itemnumber($itemnumber);
1016
    $hold->itemnumber($itemnumber);
1011
    $hold->set_waiting($transferToDo);
1017
    $hold->set_waiting($transferToDo);
1012
1018
1019
    if ($hold->reserve_group_id) {
1020
        # Delete other reserves from same group
1021
        $dbh->do(q{
1022
            DELETE FROM reserves
1023
            WHERE reserve_group_id = ?
1024
              AND reserve_id != ?
1025
        }, undef, $hold->reserve_group_id, $hold->reserve_id);
1026
        DeleteReserveGroup($hold->reserve_group_id);
1027
    }
1028
1013
    _koha_notify_reserve( $hold->reserve_id )
1029
    _koha_notify_reserve( $hold->reserve_id )
1014
      if ( !$transferToDo && !$already_on_shelf );
1030
      if ( !$transferToDo && !$already_on_shelf );
1015
1031
Lines 2134-2139 sub GetHoldRule { Link Here
2134
    return $sth->fetchrow_hashref();
2150
    return $sth->fetchrow_hashref();
2135
}
2151
}
2136
2152
2153
=head2 AddReserveGroup
2154
2155
    my $reserve_group_id = AddReserveGroup();
2156
2157
Creates a new reserve group and returns its ID
2158
2159
=cut
2160
2161
sub AddReserveGroup {
2162
    my $dbh = C4::Context->dbh;
2163
2164
    $dbh->do('INSERT INTO reserve_group VALUES ()');
2165
    return $dbh->last_insert_id(undef, undef, 'reserve_group', undef);
2166
}
2167
2168
=head2 DeleteReserveGroup
2169
2170
    DeleteReserveGroup($reserve_group_id);
2171
2172
Delete a reserve group. Reserves that belong to this group are not removed.
2173
2174
=cut
2175
2176
sub DeleteReserveGroup {
2177
    my ($reserve_group_id) = @_;
2178
2179
    my $dbh = C4::Context->dbh;
2180
    my $query = 'DELETE FROM reserve_group WHERE reserve_group_id = ?';
2181
    $dbh->do($query, undef, $reserve_group_id);
2182
}
2183
2184
=head2 GetReserveGroupReserves
2185
2186
    my @reserves = GetReserveGroupReserves($reserve_group_id);
2187
2188
Fetch all reserve from a reserve group.
2189
2190
=cut
2191
2192
sub GetReserveGroupReserves {
2193
    my ($reserve_group_id) = @_;
2194
2195
    my $dbh = C4::Context->dbh;
2196
2197
    my $reserves = $dbh->selectall_arrayref(q{
2198
        SELECT * FROM reserves
2199
        WHERE reserve_group_id = ?
2200
    }, { Slice => {} }, $reserve_group_id);
2201
2202
    return () unless defined $reserves;
2203
2204
    return @$reserves;
2205
}
2206
2137
=head1 AUTHOR
2207
=head1 AUTHOR
2138
2208
2139
Koha Development Team <http://koha-community.org/>
2209
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 106-111 my $strsth = Link Here
106
                    ORDER BY items.itemnumber SEPARATOR '<br/>') l_enumchron,
106
                    ORDER BY items.itemnumber SEPARATOR '<br/>') l_enumchron,
107
            GROUP_CONCAT(DISTINCT items.copynumber
107
            GROUP_CONCAT(DISTINCT items.copynumber
108
                    ORDER BY items.itemnumber SEPARATOR '<br/>') l_copynumber,
108
                    ORDER BY items.itemnumber SEPARATOR '<br/>') l_copynumber,
109
            reserves.reserve_group_id,
109
            biblio.title,
110
            biblio.title,
110
            biblio.author,
111
            biblio.author,
111
            count(DISTINCT items.itemnumber) as icount,
112
            count(DISTINCT items.itemnumber) as icount,
Lines 167-172 while ( my $data = $sth->fetchrow_hashref ) { Link Here
167
            pullcount       => $data->{icount} <= $data->{rcount} ? $data->{icount} : $data->{rcount},
168
            pullcount       => $data->{icount} <= $data->{rcount} ? $data->{icount} : $data->{rcount},
168
            itypes          => [split('\|', $data->{l_itype})],
169
            itypes          => [split('\|', $data->{l_itype})],
169
            locations       => [split('\|', $data->{l_location})],
170
            locations       => [split('\|', $data->{l_location})],
171
            reserve_group_id => $data->{reserve_group_id},
170
        }
172
        }
171
    );
173
    );
172
}
174
}
(-)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 1899-1904 CREATE TABLE `reserves` ( -- information related to holds/reserves in Koha Link Here
1899
  `suspend` BOOLEAN NOT NULL DEFAULT 0,
1899
  `suspend` BOOLEAN NOT NULL DEFAULT 0,
1900
  `suspend_until` DATETIME NULL DEFAULT NULL,
1900
  `suspend_until` DATETIME NULL DEFAULT NULL,
1901
  `itemtype` VARCHAR(10) NULL DEFAULT NULL, -- If record level hold, the optional itemtype of the item the patron is requesting
1901
  `itemtype` VARCHAR(10) NULL DEFAULT NULL, -- If record level hold, the optional itemtype of the item the patron is requesting
1902
  `reserve_group_id` int unsigned NULL DEFAULT NULL,  -- Id used on reservations spanning multiple titles
1902
  PRIMARY KEY (`reserve_id`),
1903
  PRIMARY KEY (`reserve_id`),
1903
  KEY priorityfoundidx (priority,found),
1904
  KEY priorityfoundidx (priority,found),
1904
  KEY `borrowernumber` (`borrowernumber`),
1905
  KEY `borrowernumber` (`borrowernumber`),
Lines 1910-1916 CREATE TABLE `reserves` ( -- information related to holds/reserves in Koha Link Here
1910
  CONSTRAINT `reserves_ibfk_2` FOREIGN KEY (`biblionumber`) REFERENCES `biblio` (`biblionumber`) ON DELETE CASCADE ON UPDATE CASCADE,
1911
  CONSTRAINT `reserves_ibfk_2` FOREIGN KEY (`biblionumber`) REFERENCES `biblio` (`biblionumber`) ON DELETE CASCADE ON UPDATE CASCADE,
1911
  CONSTRAINT `reserves_ibfk_3` FOREIGN KEY (`itemnumber`) REFERENCES `items` (`itemnumber`) ON DELETE CASCADE ON UPDATE CASCADE,
1912
  CONSTRAINT `reserves_ibfk_3` FOREIGN KEY (`itemnumber`) REFERENCES `items` (`itemnumber`) ON DELETE CASCADE ON UPDATE CASCADE,
1912
  CONSTRAINT `reserves_ibfk_4` FOREIGN KEY (`branchcode`) REFERENCES `branches` (`branchcode`) ON DELETE CASCADE ON UPDATE CASCADE,
1913
  CONSTRAINT `reserves_ibfk_4` FOREIGN KEY (`branchcode`) REFERENCES `branches` (`branchcode`) ON DELETE CASCADE ON UPDATE CASCADE,
1913
  CONSTRAINT `reserves_ibfk_5` FOREIGN KEY (`itemtype`) REFERENCES `itemtypes` (`itemtype`) ON DELETE CASCADE ON UPDATE CASCADE
1914
  CONSTRAINT `reserves_ibfk_5` FOREIGN KEY (`itemtype`) REFERENCES `itemtypes` (`itemtype`) ON DELETE CASCADE ON UPDATE CASCADE,
1915
  CONSTRAINT `reserves_ibfk_6` FOREIGN KEY (`reserve_group_id`) REFERENCES `reserve_group` (`reserve_group_id`) ON DELETE SET NULL ON UPDATE CASCADE
1916
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
1917
1918
--
1919
-- Table structure for table reserve_group
1920
--
1921
1922
DROP TABLE IF EXISTS `reserve_group`;
1923
CREATE TABLE `reserve_group` (
1924
  `reserve_group_id` int unsigned NOT NULL AUTO_INCREMENT,
1925
  PRIMARY KEY(`reserve_group_id`)
1914
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
1926
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
1915
1927
1916
--
1928
--
(-)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 43-47 Link Here
43
    var SUSPEND_HOLD_ERROR_NOT_FOUND = _("Unable to suspend hold, hold not found");
43
    var SUSPEND_HOLD_ERROR_NOT_FOUND = _("Unable to suspend hold, hold not found");
44
    var RESUME_HOLD_ERROR_NOT_FOUND = _("Unable to resume, hold not found");
44
    var RESUME_HOLD_ERROR_NOT_FOUND = _("Unable to resume, hold not found");
45
    var CURRENT = _(" (current) ");
45
    var CURRENT = _(" (current) ");
46
    var PART_OF_A = _("(part of a %s)");
47
    var RESERVE_GROUP = _("reserve group");
46
//]]>
48
//]]>
47
</script>
49
</script>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt (+1 lines)
Lines 1095-1098 No patron matched <span class="ex">[% message | html %]</span> Link Here
1095
    </div>
1095
    </div>
1096
    </div>
1096
    </div>
1097
</div>
1097
</div>
1098
[% INCLUDE 'reserve-group-modal.inc' %]
1098
[% INCLUDE 'intranet-bottom.inc' %]
1099
[% INCLUDE 'intranet-bottom.inc' %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tt (-4 / +12 lines)
Lines 54-63 Link Here
54
            <td>[% reserveloo.rcount %]</td>
54
            <td>[% reserveloo.rcount %]</td>
55
            <td><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% reserveloo.borrowernumber %]">[% reserveloo.firstname %] [%reserveloo.surname %]</a></td>
55
            <td><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% reserveloo.borrowernumber %]">[% reserveloo.firstname %] [%reserveloo.surname %]</a></td>
56
            <td>
56
            <td>
57
            <p>
57
                <p>
58
                [% INCLUDE 'biblio-default-view.inc' biblionumber = reserveloo.biblionumber %]
58
                    [% INCLUDE 'biblio-default-view.inc' biblionumber = reserveloo.biblionumber %]
59
                [% reserveloo.title |html %] [% FOREACH s IN reserveloo.subtitle %] [% s %][% END %]</a></p>
59
                    [% reserveloo.title |html %] [% FOREACH s IN reserveloo.subtitle %] [% s %][% END %]</a>
60
                [% IF ( reserveloo.author ) %]<p> by [% reserveloo.author %]</p>[% END %]
60
                </p>
61
                [% IF ( reserveloo.author ) %]
62
                    <p> by [% reserveloo.author %]</p>
63
                [% END %]
64
                [% IF reserveloo.reserve_group_id %]
65
                    <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>
66
                [% END %]
61
            </td>
67
            </td>
62
        [% ELSE %]
68
        [% ELSE %]
63
            <td>"</td>
69
            <td>"</td>
Lines 212-215 Link Here
212
    </script>
218
    </script>
213
[% END %]
219
[% END %]
214
220
221
[%# TODO: this modul needs to be separated to html and js part to be icnluded correctly %]
222
[% INCLUDE 'reserve-group-modal.inc' %]
215
[% INCLUDE 'intranet-bottom.inc' %]
223
[% INCLUDE 'intranet-bottom.inc' %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt (+1 lines)
Lines 642-645 function validate1(date) { Link Here
642
[% INCLUDE 'circ-menu.inc' %]
642
[% INCLUDE 'circ-menu.inc' %]
643
</div>
643
</div>
644
</div>
644
</div>
645
[% INCLUDE 'reserve-group-modal.inc' %]
645
[% INCLUDE 'intranet-bottom.inc' %]
646
[% INCLUDE 'intranet-bottom.inc' %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt (-4 / +14 lines)
Lines 411-430 function checkMultiHold() { Link Here
411
        <a href="#" id="clear-date-to" class="clear-date">Clear date</a>
411
        <a href="#" id="clear-date-to" class="clear-date">Clear date</a>
412
	</li>
412
	</li>
413
413
414
        [% UNLESS ( multi_hold ) %]
415
          <li> <label for="requestany">Hold next available item </label>
414
          <li> <label for="requestany">Hold next available item </label>
416
               [% IF force_hold_level == 'item' %]
415
              [% IF multi_hold %]
416
                  <input type="checkbox" id="requestany" name="requestany" value="1" />
417
              [% ELSE %]
418
                [% IF force_hold_level == 'item' %]
417
                   <input type="checkbox" id="requestany" name="request" disabled="true" />
419
                   <input type="checkbox" id="requestany" name="request" disabled="true" />
418
               [% ELSIF force_hold_level == 'record' %]
420
                [% ELSIF force_hold_level == 'record' %]
419
                   <input type="checkbox" id="requestany" checked="checked" value="Any" disabled="true"/>
421
                   <input type="checkbox" id="requestany" checked="checked" value="Any" disabled="true"/>
420
                   <input type="hidden" name="request" value="Any"/>
422
                   <input type="hidden" name="request" value="Any"/>
421
               [% ELSE %]
423
                [% ELSE %]
422
                   <input type="checkbox" id="requestany" name="request" checked="checked" value="Any" />
424
                   <input type="checkbox" id="requestany" name="request" checked="checked" value="Any" />
423
                [% END %]
425
                [% END %]
426
              [% END %]
424
               <input type="hidden" name="biblioitem" value="[% biblioitemnumber %]" />
427
               <input type="hidden" name="biblioitem" value="[% biblioitemnumber %]" />
425
               <input type="hidden" name="alreadyreserved" value="[% alreadyreserved %]" />
428
               <input type="hidden" name="alreadyreserved" value="[% alreadyreserved %]" />
426
          </li>
429
          </li>
427
430
431
        [% UNLESS ( multi_hold ) %]
428
          [% IF remaining_holds_for_record > 1 %]
432
          [% IF remaining_holds_for_record > 1 %]
429
              <li>
433
              <li>
430
                   <label for="holds_to_place_count">Holds to place (count)</label>
434
                   <label for="holds_to_place_count">Holds to place (count)</label>
Lines 838-843 function checkMultiHold() { Link Here
838
                 <input type="hidden" name="itemnumber" value="" />
842
                 <input type="hidden" name="itemnumber" value="" />
839
            [% END %]
843
            [% END %]
840
    [% END %]
844
    [% END %]
845
            [% IF reserveloo.reserve_group_id %]
846
                <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>
847
            [% END %]
841
        </td>
848
        </td>
842
849
843
    [% IF ( CAN_user_reserveforothers_modify_holds_priority ) %]
850
    [% IF ( CAN_user_reserveforothers_modify_holds_priority ) %]
Lines 900-903 function checkMultiHold() { Link Here
900
907
901
</div>
908
</div>
902
</div>
909
</div>
910
911
[% INCLUDE 'reserve-group-modal.inc' %]
912
903
[% INCLUDE 'intranet-bottom.inc' %]
913
[% 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 51-56 my $title = $input->param('title'); Link Here
51
my $checkitem      = $input->param('checkitem');
51
my $checkitem      = $input->param('checkitem');
52
my $expirationdate = $input->param('expiration_date');
52
my $expirationdate = $input->param('expiration_date');
53
my $itemtype       = $input->param('itemtype') || undef;
53
my $itemtype       = $input->param('itemtype') || undef;
54
my $requestany     = $input->param('requestany');
54
55
55
my $borrower = Koha::Patrons->find( $borrowernumber );
56
my $borrower = Koha::Patrons->find( $borrowernumber );
56
$borrower = $borrower->unblessed if $borrower;
57
$borrower = $borrower->unblessed if $borrower;
Lines 85-90 if (defined $checkitem && $checkitem ne ''){ Link Here
85
86
86
if ( $type eq 'str8' && $borrower ) {
87
if ( $type eq 'str8' && $borrower ) {
87
88
89
    my $reserve_group_id;
90
    if ($multi_hold && $requestany) {
91
        $reserve_group_id = AddReserveGroup();
92
    }
93
88
    foreach my $biblionumber ( keys %bibinfos ) {
94
    foreach my $biblionumber ( keys %bibinfos ) {
89
        my $count = @bibitems;
95
        my $count = @bibitems;
90
        @bibitems = sort @bibitems;
96
        @bibitems = sort @bibitems;
Lines 108-115 if ( $type eq 'str8' && $borrower ) { Link Here
108
114
109
        if ($multi_hold) {
115
        if ($multi_hold) {
110
            my $bibinfo = $bibinfos{$biblionumber};
116
            my $bibinfo = $bibinfos{$biblionumber};
111
            AddReserve($branch,$borrower->{'borrowernumber'},$biblionumber,[$biblionumber],
117
            AddReserve($branch, $borrower->{'borrowernumber'}, $biblionumber,
112
                       $bibinfo->{rank},$startdate,$expirationdate,$notes,$bibinfo->{title},$checkitem,$found);
118
                [$biblionumber], $bibinfo->{rank}, $startdate, $expirationdate,
119
                $notes, $bibinfo->{title}, $checkitem, $found, $itemtype,
120
                $reserve_group_id);
113
        } else {
121
        } else {
114
            # place a request on 1st available
122
            # place a request on 1st available
115
            for ( my $i = 0 ; $i < $holds_to_place_count ; $i++ ) {
123
            for ( my $i = 0 ; $i < $holds_to_place_count ; $i++ ) {
(-)a/reserve/request.pl (+1 lines)
Lines 595-600 foreach my $biblionumber (@biblionumbers) { Link Here
595
        $reserve{'reserve_id'}     = $res->reserve_id();
595
        $reserve{'reserve_id'}     = $res->reserve_id();
596
        $reserve{itemtype}         = $res->itemtype();
596
        $reserve{itemtype}         = $res->itemtype();
597
        $reserve{branchcode}       = $res->branchcode();
597
        $reserve{branchcode}       = $res->branchcode();
598
        $reserve{'reserve_group_id'} = $res->reserve_group_id;
598
599
599
        push( @reserveloop, \%reserve );
600
        push( @reserveloop, \%reserve );
600
    }
601
    }
(-)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