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

(-)a/circ/circulation.pl (-1 / +1 lines)
Lines 446-452 if ($patron) { Link Here
446
    my $holds = Koha::Holds->search( { borrowernumber => $borrowernumber } ); # FIXME must be Koha::Patron->holds
446
    my $holds = Koha::Holds->search( { borrowernumber => $borrowernumber } ); # FIXME must be Koha::Patron->holds
447
    my $waiting_holds = $holds->waiting;
447
    my $waiting_holds = $holds->waiting;
448
    $template->param(
448
    $template->param(
449
        holds_count  => $holds->count(),
449
        holds_count  => $holds->count_holds,
450
        WaitingHolds => $waiting_holds,
450
        WaitingHolds => $waiting_holds,
451
    );
451
    );
452
452
(-)a/circ/view_holdsqueue.pl (+2 lines)
Lines 56-61 if ( $run_report ) { Link Here
56
    });
56
    });
57
    for my $item ( @$items ) {
57
    for my $item ( @$items ) {
58
        $item->{patron} = Koha::Patrons->find( $item->{borrowernumber} );
58
        $item->{patron} = Koha::Patrons->find( $item->{borrowernumber} );
59
        my $related_hold = Koha::Holds->search({ borrowernumber => $item->{borrowernumber}, reservedate => $item->{reservedate}, biblionumber => $item->{biblionumber} }, { order_by => 'reservedate' })->next;
60
        $item->{hold_group_id} = $related_hold ? $related_hold->hold_group_id : undef;
59
    }
61
    }
60
    $template->param(
62
    $template->param(
61
        branchlimit     => $branchlimit,
63
        branchlimit     => $branchlimit,
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/hold-group-modal.inc (+15 lines)
Line 0 Link Here
1
<div id="hold-group-modal" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="hold-group-modal-label">
2
    <div class="modal-dialog" role="document">
3
        <div class="modal-content">
4
            <div class="modal-header">
5
                <button type="button" class="closebtn" data-dismiss="modal" aria-hidden="true">×</button>
6
                <h4 class="modal-title" id="hold-group-modal-label">Hold group</h4>
7
            </div>
8
            <div class="modal-body">
9
            </div>
10
            <div class="modal-footer">
11
                <button type="button" class="btn btn-default deny" data-dismiss="modal">Close</button>
12
            </div>
13
        </div><!-- /.modal-content -->
14
    </div><!-- /.modal-dialog -->
15
</div><!-- /.modal -->
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/holds_table.inc (+3 lines)
Lines 186-191 Link Here
186
                [%- IF hold.non_priority -%]
186
                [%- IF hold.non_priority -%]
187
                    <br><i>Non priority hold</i>
187
                    <br><i>Non priority hold</i>
188
                [%- END -%]
188
                [%- END -%]
189
                [%- IF hold.hold_group_id -%]
190
                    <div>(part of a <a href="/cgi-bin/koha/reserve/hold-group.pl?hold_group_id=[% hold.hold_group_id | uri %]" class="hold-group">hold group</a>)</div>
191
                [%- END -%]
189
            </td>
192
            </td>
190
            [%- IF ( CAN_user_reserveforothers_modify_holds_priority ) -%]
193
            [%- IF ( CAN_user_reserveforothers_modify_holds_priority ) -%]
191
            [%- UNLESS hold.found -%]
194
            [%- UNLESS hold.found -%]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt (+3 lines)
Lines 1024-1029 Link Here
1024
    </div> <!-- /.modal-dialog -->
1024
    </div> <!-- /.modal-dialog -->
1025
</div> <!-- /#barcodeSubmittedModal -->
1025
</div> <!-- /#barcodeSubmittedModal -->
1026
1026
1027
[% INCLUDE 'hold-group-modal.inc' %]
1028
1027
[% MACRO jsinclude BLOCK %]
1029
[% MACRO jsinclude BLOCK %]
1028
    [% INCLUDE 'datatables.inc' %]
1030
    [% INCLUDE 'datatables.inc' %]
1029
    [% INCLUDE 'columns_settings.inc' %]
1031
    [% INCLUDE 'columns_settings.inc' %]
Lines 1058-1063 Link Here
1058
    [% END %]
1060
    [% END %]
1059
    [% Asset.js("js/holds.js") | $raw %]
1061
    [% Asset.js("js/holds.js") | $raw %]
1060
    [% INCLUDE 'calendar.inc' %]
1062
    [% INCLUDE 'calendar.inc' %]
1063
    [% Asset.js("js/hold-group.js") | $raw %]
1061
    <script>
1064
    <script>
1062
        table_settings_issues_table = [% TablesSettings.GetTableSettings( 'circ', 'circulation', 'issues-table', 'json' ) | $raw %]
1065
        table_settings_issues_table = [% TablesSettings.GetTableSettings( 'circ', 'circulation', 'issues-table', 'json' ) | $raw %]
1063
        table_settings_borrowers_table = [% TablesSettings.GetTableSettings( 'circ', 'circulation', 'table_borrowers', 'json' ) | $raw %]
1066
        table_settings_borrowers_table = [% TablesSettings.GetTableSettings( 'circ', 'circulation', 'table_borrowers', 'json' ) | $raw %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tt (+6 lines)
Lines 106-111 Link Here
106
                [% ELSE %]
106
                [% ELSE %]
107
                    [% IF ( biblio.biblioitem.publicationyear ) %]<p>[% biblio.biblioitem.publicationyear | html %]</p>[% END %]
107
                    [% IF ( biblio.biblioitem.publicationyear ) %]<p>[% biblio.biblioitem.publicationyear | html %]</p>[% END %]
108
                [% END %]
108
                [% END %]
109
                [% IF ( hold.hold_group_id ) %]
110
                    <p>(part of a <a class="hold-group" href="/cgi-bin/koha/reserve/hold-group.pl?hold_group_id=[% hold.hold_group_id | html %]">hold group</a>)</p>
111
                [% END %]
109
            </td>
112
            </td>
110
        [% ELSE %]
113
        [% ELSE %]
111
            <td>"</td>
114
            <td>"</td>
Lines 295-304 Link Here
295
        </div> <!-- /.col-sm-2.col-sm-pull-10 -->
298
        </div> <!-- /.col-sm-2.col-sm-pull-10 -->
296
     </div> <!-- /.row -->
299
     </div> <!-- /.row -->
297
300
301
     [% INCLUDE 'hold-group-modal.inc' %]
302
298
[% MACRO jsinclude BLOCK %]
303
[% MACRO jsinclude BLOCK %]
299
    [% INCLUDE 'calendar.inc' %]
304
    [% INCLUDE 'calendar.inc' %]
300
    [% INCLUDE 'datatables.inc' %]
305
    [% INCLUDE 'datatables.inc' %]
301
    [% INCLUDE 'columns_settings.inc' %]
306
    [% INCLUDE 'columns_settings.inc' %]
307
    [% Asset.js("js/hold-group.js") | $raw %]
302
    <script>
308
    <script>
303
        $(document).ready(function() {
309
        $(document).ready(function() {
304
          var table_settings = [% TablesSettings.GetTableSettings('circ', 'holds', 'holds-to-pull', 'json') | $raw %];
310
          var table_settings = [% TablesSettings.GetTableSettings('circ', 'holds', 'holds-to-pull', 'json') | $raw %];
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/view_holdsqueue.tt (+6 lines)
Lines 190-195 Link Here
190
                [% ELSE %]
190
                [% ELSE %]
191
                    <strong>[% itemsloo.barcode | html %]</strong> <em>or any available</em>
191
                    <strong>[% itemsloo.barcode | html %]</strong> <em>or any available</em>
192
                [% END %]
192
                [% END %]
193
                [% IF itemsloo.hold_group_id %]
194
                    <div>(part of a <a href="/cgi-bin/koha/reserve/hold-group.pl?hold_group_id=[% itemsloo.hold_group_id | uri %]" class="hold-group">hold group</a>)</div>
195
                [% END %]
193
            </td>
196
            </td>
194
            <td class="hq-patron">
197
            <td class="hq-patron">
195
              <p>
198
              <p>
Lines 278-286 Link Here
278
    </form>
281
    </form>
279
[% END %]
282
[% END %]
280
283
284
[% INCLUDE 'hold-group-modal.inc' %]
285
281
[% MACRO jsinclude BLOCK %]
286
[% MACRO jsinclude BLOCK %]
282
    [% INCLUDE 'datatables.inc' %]
287
    [% INCLUDE 'datatables.inc' %]
283
    [% INCLUDE 'columns_settings.inc' %]
288
    [% INCLUDE 'columns_settings.inc' %]
289
    [% Asset.js("js/hold-group.js") | $raw %]
284
    <script>
290
    <script>
285
        $(document).ready(function() {
291
        $(document).ready(function() {
286
            var holdst;
292
            var holdst;
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt (+3 lines)
Lines 833-838 Link Here
833
            [% INCLUDE 'modals/resolve_return_claim.inc' %]
833
            [% INCLUDE 'modals/resolve_return_claim.inc' %]
834
        [% END %]
834
        [% END %]
835
835
836
        [% INCLUDE 'hold-group-modal.inc' %]
837
836
[% MACRO jsinclude BLOCK %]
838
[% MACRO jsinclude BLOCK %]
837
    [% INCLUDE 'datatables.inc' %]
839
    [% INCLUDE 'datatables.inc' %]
838
    [% Asset.js("lib/jquery/plugins/rowGroup/dataTables.rowGroup.min.js") | $raw %]
840
    [% Asset.js("lib/jquery/plugins/rowGroup/dataTables.rowGroup.min.js") | $raw %]
Lines 870-875 Link Here
870
    [% INCLUDE 'str/members-menu.inc' %]
872
    [% INCLUDE 'str/members-menu.inc' %]
871
    [% Asset.js("js/members-menu.js") | $raw %]
873
    [% Asset.js("js/members-menu.js") | $raw %]
872
    [% Asset.js("js/recalls.js") | $raw %]
874
    [% Asset.js("js/recalls.js") | $raw %]
875
    [% Asset.js("js/hold-group.js") | $raw %]
873
    <script>
876
    <script>
874
877
875
        table_settings_issues_table = [% TablesSettings.GetTableSettings( 'members', 'moremember', 'issues-table', 'json' ) | $raw %]
878
        table_settings_issues_table = [% TablesSettings.GetTableSettings( 'members', 'moremember', 'issues-table', 'json' ) | $raw %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/hold-group.tt (+30 lines)
Line 0 Link Here
1
[% INCLUDE 'doc-head-open.inc' %]
2
  <title>Holds group ([% hold_group.id | html %]) &rsaquo; Holds &rsaquo; Circulation &rsaquo; Koha</title>
3
  [% INCLUDE 'doc-head-close.inc' %]
4
</head>
5
<body id="hold-group">
6
  <h1>Holds group ([% hold_group.id | html %])</h1>
7
  <div id="main">
8
    [% holds = hold_group.holds %]
9
    [% IF holds.count %]
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 hold IN holds %]
20
            [% biblio = hold.biblio %]
21
            <tr>
22
              <td><a href="/cgi-bin/koha/reserve/request.pl?biblionumber=[% biblio.biblionumber | uri %]">[% biblio.title | html %]</a></td>
23
              <td>[% hold.priority | html %]</td>
24
              <td>[% hold.reservenotes | html %]</td>
25
            </tr>
26
          [% END %]
27
        </tbody>
28
      <table>
29
    [% END %]
30
  [% INCLUDE 'intranet-bottom.inc' %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt (-4 / +13 lines)
Lines 595-601 Link Here
595
595
596
                            [% UNLESS ( multi_hold ) %]
596
                            [% UNLESS ( multi_hold ) %]
597
                                <li>
597
                                <li>
598
                                    <label for="requestany">Hold next available item </label>
598
                                    <label for="requestany">Hold next available item: </label>
599
                                    [% IF force_hold_level == 'item' %]
599
                                    [% IF force_hold_level == 'item' %]
600
                                        <input type="checkbox" id="requestany" name="request" disabled="true" />
600
                                        <input type="checkbox" id="requestany" name="request" disabled="true" />
601
                                    [% ELSIF force_hold_level == 'record' %]
601
                                    [% ELSIF force_hold_level == 'record' %]
Lines 609-615 Link Here
609
609
610
                                [% IF remaining_holds_for_record > 1 %]
610
                                [% IF remaining_holds_for_record > 1 %]
611
                                    <li>
611
                                    <li>
612
                                        <label for="holds_to_place_count">Holds to place (count)</label>
612
                                        <label for="holds_to_place_count">Holds to place (count): </label>
613
                                        <input type="text" inputmode="numeric" pattern="[0-9]*" id="holds_to_place_count" name="holds_to_place_count" maxlength="[% remaining_holds_for_record | html %]" value="1" />
613
                                        <input type="text" inputmode="numeric" pattern="[0-9]*" id="holds_to_place_count" name="holds_to_place_count" maxlength="[% remaining_holds_for_record | html %]" value="1" />
614
                                    </li>
614
                                    </li>
615
                                [% ELSE %]
615
                                [% ELSE %]
Lines 622-627 Link Here
622
                                <input name="non_priority" id="non_priority" type="checkbox" />
622
                                <input name="non_priority" id="non_priority" type="checkbox" />
623
                                <span class="hint">A non priority hold doesn't prevent a current checkout from renewing</span>
623
                                <span class="hint">A non priority hold doesn't prevent a current checkout from renewing</span>
624
                            </li>
624
                            </li>
625
626
                            <li id="hold_group_list_item">
627
                                <label for="hold_group">Treat as hold group: </label>
628
                                <input name="hold_group" id="hold_group" type="checkbox" />
629
                                <span class="hint">Place a hold on the next available title from this group</span>
630
                            </li>
625
                        </ol>
631
                        </ol>
626
632
627
                        [% UNLESS ( multi_hold ) %]
633
                        [% UNLESS ( multi_hold ) %]
Lines 696-704 Link Here
696
                                                            Hold must be record level
702
                                                            Hold must be record level
697
                                                        </span>
703
                                                        </span>
698
                                                    [% ELSIF ( itemloo.available ) %]
704
                                                    [% ELSIF ( itemloo.available ) %]
699
                                                        <input type="radio" name="checkitem" value="[% itemloo.itemnumber | html %]" />
705
                                                        <input type="checkbox" name="checkitem" value="[% itemloo.itemnumber | html %]" />
700
                                                    [% ELSIF ( itemloo.override ) %]
706
                                                    [% ELSIF ( itemloo.override ) %]
701
                                                        <input type="radio" name="checkitem" class="needsoverride" value="[% itemloo.itemnumber | html %]" />
707
                                                        <input type="checkbox" name="checkitem" class="needsoverride" value="[% itemloo.itemnumber | html %]" />
702
                                                        <i class="fa fa-exclamation-triangle fa-lg" style="color:gold" title="Requires override of hold policy"/></i>
708
                                                        <i class="fa fa-exclamation-triangle fa-lg" style="color:gold" title="Requires override of hold policy"/></i>
703
                                                    [% ELSE %]
709
                                                    [% ELSE %]
704
                                                        <span class="error">
710
                                                        <span class="error">
Lines 1221-1226 Link Here
1221
        </div>
1227
        </div>
1222
    </div>
1228
    </div>
1223
1229
1230
    [% INCLUDE 'hold-group-modal.inc' %]
1231
1224
[% MACRO jsinclude BLOCK %]
1232
[% MACRO jsinclude BLOCK %]
1225
    [% INCLUDE 'datatables.inc' %]
1233
    [% INCLUDE 'datatables.inc' %]
1226
    [% INCLUDE 'calendar.inc' %]
1234
    [% INCLUDE 'calendar.inc' %]
Lines 1228-1233 Link Here
1228
    [% Asset.js("lib/hc-sticky.js") | $raw %]
1236
    [% Asset.js("lib/hc-sticky.js") | $raw %]
1229
    [% INCLUDE 'select2.inc' %]
1237
    [% INCLUDE 'select2.inc' %]
1230
    [% Asset.js("js/holds.js") | $raw%]
1238
    [% Asset.js("js/holds.js") | $raw%]
1239
    [% Asset.js("js/hold-group.js") | $raw %]
1231
1240
1232
    [% SET url_biblio_params = "biblionumber=" _ biblionumbers.join("&amp;biblionumber=") %]
1241
    [% SET url_biblio_params = "biblionumber=" _ biblionumbers.join("&amp;biblionumber=") %]
1233
    [% IF multi_hold %]
1242
    [% IF multi_hold %]
(-)a/koha-tmpl/intranet-tmpl/prog/js/hold-group.js (+8 lines)
Line 0 Link Here
1
$(document).ready(function() {
2
    $('body').on('click', 'a.hold-group', function() {
3
        var href = $(this).attr('href');
4
        $('#hold-group-modal .modal-body').load(href + " #main");
5
        $('#hold-group-modal').modal('show');
6
        return false;
7
    });
8
});
(-)a/koha-tmpl/intranet-tmpl/prog/js/holds.js (+6 lines)
Lines 164-169 $(document).ready(function() { Link Here
164
                                title += " - <span class='" + span_class + "'>" + oObj.itemnotes.escapeHtml() + "</span>"
164
                                title += " - <span class='" + span_class + "'>" + oObj.itemnotes.escapeHtml() + "</span>"
165
                            }
165
                            }
166
166
167
                            if ( oObj.hold_group_id ) {
168
                                title += '<br>';
169
                                var link = '<a class="hold-group" href="/cgi-bin/koha/reserve/hold-group.pl?hold_group_id=' + oObj.hold_group_id + '">' + __("part of a hold group") +'</a>'
170
                                title += '<span>(' + link + ')</span>';
171
                            }
172
167
                            return title;
173
                            return title;
168
                        }
174
                        }
169
                    },
175
                    },
(-)a/members/moremember.pl (-2 / +2 lines)
Lines 195-201 if ( $patron->is_expired || $patron->is_going_to_expire ) { Link Here
195
my $holds = Koha::Holds->search( { borrowernumber => $borrowernumber } ); # FIXME must be Koha::Patron->holds
195
my $holds = Koha::Holds->search( { borrowernumber => $borrowernumber } ); # FIXME must be Koha::Patron->holds
196
my $waiting_holds = $holds->waiting;
196
my $waiting_holds = $holds->waiting;
197
$template->param(
197
$template->param(
198
    holds_count  => $holds->count(),
198
    holds_count  => $holds->count_holds,
199
    WaitingHolds => $waiting_holds,
199
    WaitingHolds => $waiting_holds,
200
);
200
);
201
201
Lines 265-271 my $has_modifications = Koha::Patron::Modifications->search( { borrowernumber => Link Here
265
$template->param(
265
$template->param(
266
    patron          => $patron,
266
    patron          => $patron,
267
    issuecount      => $patron->checkouts->count,
267
    issuecount      => $patron->checkouts->count,
268
    holds_count     => $patron->holds->count,
268
    holds_count     => $patron->holds->count_holds,
269
    fines           => $patron->account->balance,
269
    fines           => $patron->account->balance,
270
    translated_language => $translated_language,
270
    translated_language => $translated_language,
271
    detailview      => 1,
271
    detailview      => 1,
(-)a/opac/opac-reserve.pl (-1 / +1 lines)
Lines 193-199 foreach my $biblioNumber (@biblionumbers) { Link Here
193
if ( $query->param('place_reserve') ) {
193
if ( $query->param('place_reserve') ) {
194
    my $reserve_cnt = 0;
194
    my $reserve_cnt = 0;
195
    if ($maxreserves) {
195
    if ($maxreserves) {
196
        $reserve_cnt = $patron->holds->count;
196
        $reserve_cnt = $patron->holds->count_holds;
197
    }
197
    }
198
198
199
    # List is composed of alternating biblio/item/branch
199
    # List is composed of alternating biblio/item/branch
(-)a/reserve/hold-group.pl (+40 lines)
Line 0 Link Here
1
#!/usr/bin/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 qw( get_template_and_user );
22
use C4::Output qw( output_html_with_http_headers );
23
use Koha::HoldGroups;
24
25
my $cgi = CGI->new;
26
my ( $template, $loggedinuser, $cookie, $flags ) = get_template_and_user({
27
    template_name   => "reserve/hold-group.tt",
28
    query           => $cgi,
29
    type            => "intranet",
30
    flagsrequired   => { circulate => 'circulate_remaining_permissions' },
31
});
32
33
my $reserve_group_id = $cgi->param('hold_group_id');
34
my $hold_group = Koha::HoldGroups->find($reserve_group_id);
35
36
$template->param(
37
    hold_group => $hold_group,
38
);
39
40
output_html_with_http_headers $cgi, $cookie, $template->output;
(-)a/reserve/placerequest.pl (+10 lines)
Lines 30-35 use C4::Auth qw( checkauth ); Link Here
30
30
31
use Koha::Items;
31
use Koha::Items;
32
use Koha::Patrons;
32
use Koha::Patrons;
33
use Koha::HoldGroup;
33
34
34
my $input = CGI->new();
35
my $input = CGI->new();
35
36
Lines 48-53 my $checkitem = $input->param('checkitem'); Link Here
48
my $expirationdate = $input->param('expiration_date');
49
my $expirationdate = $input->param('expiration_date');
49
my $itemtype       = $input->param('itemtype') || undef;
50
my $itemtype       = $input->param('itemtype') || undef;
50
my $non_priority   = $input->param('non_priority');
51
my $non_priority   = $input->param('non_priority');
52
my $hold_group_param     = $input->param('hold_group') || undef;
53
my $hold_group;
51
54
52
my $patron = Koha::Patrons->find( $borrowernumber );
55
my $patron = Koha::Patrons->find( $borrowernumber );
53
56
Lines 66-71 my $found; Link Here
66
69
67
if ( $patron ) {
70
if ( $patron ) {
68
71
72
    if ( $hold_group_param ) {
73
        $hold_group = Koha::HoldGroup->new->store;
74
    }
75
69
    foreach my $biblionumber ( keys %bibinfos ) {
76
    foreach my $biblionumber ( keys %bibinfos ) {
70
77
71
        my $can_override = C4::Context->preference('AllowHoldPolicyOverride');
78
        my $can_override = C4::Context->preference('AllowHoldPolicyOverride');
Lines 96-101 if ( $patron ) { Link Here
96
                            found            => $found,
103
                            found            => $found,
97
                            itemtype         => $itemtype,
104
                            itemtype         => $itemtype,
98
                            non_priority     => $non_priority,
105
                            non_priority     => $non_priority,
106
                            hold_group_id    => $hold_group ? $hold_group->id : undef,
99
                        }
107
                        }
100
                    );
108
                    );
101
109
Lines 119-124 if ( $patron ) { Link Here
119
                        found            => $found,
127
                        found            => $found,
120
                        itemtype         => $itemtype,
128
                        itemtype         => $itemtype,
121
                        non_priority     => $non_priority,
129
                        non_priority     => $non_priority,
130
                        hold_group_id    => $hold_group ? $hold_group->id : undef,
122
                    }
131
                    }
123
                );
132
                );
124
            }
133
            }
Lines 140-145 if ( $patron ) { Link Here
140
                            found            => $found,
149
                            found            => $found,
141
                            itemtype         => $itemtype,
150
                            itemtype         => $itemtype,
142
                            non_priority     => $non_priority,
151
                            non_priority     => $non_priority,
152
                            hold_group_id    => $hold_group ? $hold_group->id : undef,
143
                        }
153
                        }
144
                    );
154
                    );
145
                }
155
                }
(-)a/reserve/request.pl (-1 / +2 lines)
Lines 182-188 if ($borrowernumber_hold && !$action) { Link Here
182
    # we check the reserves of the user, and if they can reserve a document
182
    # we check the reserves of the user, and if they can reserve a document
183
    # FIXME At this time we have a simple count of reservs, but, later, we could improve the infos "title" ...
183
    # FIXME At this time we have a simple count of reservs, but, later, we could improve the infos "title" ...
184
184
185
    my $reserves_count = $patron->holds->count;
185
    my $reserves_count = $patron->holds->count_holds;
186
186
187
    my $new_reserves_count = scalar( @biblionumbers );
187
    my $new_reserves_count = scalar( @biblionumbers );
188
188
Lines 646-651 if ( ( $findborrower && $borrowernumber_hold || $findclub && $club_hold ) Link Here
646
                $reserve{branchcode}       = $res->branchcode();
646
                $reserve{branchcode}       = $res->branchcode();
647
                $reserve{non_priority}     = $res->non_priority();
647
                $reserve{non_priority}     = $res->non_priority();
648
                $reserve{object}           = $res;
648
                $reserve{object}           = $res;
649
                $reserve{hold_group_id}    = $res->hold_group_id;
649
650
650
                push( @reserveloop, \%reserve );
651
                push( @reserveloop, \%reserve );
651
            }
652
            }
(-)a/svc/holds (-1 / +1 lines)
Lines 114-119 while ( my $h = $holds_rs->next() ) { Link Here
114
        waiting_here   => $h->branch()->branchcode() eq $branch,
114
        waiting_here   => $h->branch()->branchcode() eq $branch,
115
        priority       => $h->priority(),
115
        priority       => $h->priority(),
116
        itemtype_limit => $itemtype_limit,
116
        itemtype_limit => $itemtype_limit,
117
        hold_group_id  => $h->hold_group_id,
117
        reservedate_formatted => $h->reservedate() ? output_pref(
118
        reservedate_formatted => $h->reservedate() ? output_pref(
118
            { dt => dt_from_string( $h->reservedate() ), dateonly => 1 }
119
            { dt => dt_from_string( $h->reservedate() ), dateonly => 1 }
119
          )
120
          )
120
- 

Return to bug 15516