Bugzilla – Attachment 183915 Details for
Bug 15516
Allow to place a hold on first available item from a group of titles
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 15516: (follow-up) Fix some merge bugs
Bug-15516-follow-up-Fix-some-merge-bugs.patch (text/plain), 5.19 KB, created by
David Cook
on 2025-07-10 06:27:07 UTC
(
hide
)
Description:
Bug 15516: (follow-up) Fix some merge bugs
Filename:
MIME Type:
Creator:
David Cook
Created:
2025-07-10 06:27:07 UTC
Size:
5.19 KB
patch
obsolete
>From 8d77e9256a87942600cd0698112ed5ba413b5c06 Mon Sep 17 00:00:00 2001 >From: David Cook <dcook@prosentient.com.au> >Date: Thu, 10 Jul 2025 06:26:30 +0000 >Subject: [PATCH] Bug 15516: (follow-up) Fix some merge bugs > >--- > C4/Reserves.pm | 2 +- > Koha/Holds.pm | 5 +---- > circ/view_holdsqueue.pl | 10 ---------- > .../prog/en/includes/hold-group-modal.inc | 15 +++++++++------ > .../prog/en/modules/circ/view_holdsqueue.tt | 3 ++- > 5 files changed, 13 insertions(+), 22 deletions(-) > >diff --git a/C4/Reserves.pm b/C4/Reserves.pm >index a1740017d1..5bb48365ec 100644 >--- a/C4/Reserves.pm >+++ b/C4/Reserves.pm >@@ -391,7 +391,7 @@ sub CanBookBeReserved { > > $reservesallowed = ( $reservesallowed eq '' ) ? undef : $reservesallowed; > >- my $count = $patron->holds->search( >+ my $count = $patron->holds->count_holds( > { > '-or' => [ > { 'me.itemtype' => $params->{itemtype} }, >diff --git a/Koha/Holds.pm b/Koha/Holds.pm >index 300c10d4b1..62b3e0e8cf 100644 >--- a/Koha/Holds.pm >+++ b/Koha/Holds.pm >@@ -222,11 +222,8 @@ sub count_holds { > $search_params->{hold_group_id} = undef; > my $holds_without_group_count = $self->search($search_params)->count(); > >- $search_params = { >- hold_group_id => { '!=', undef }, >- }; >+ $search_params->{hold_group_id} = { '!=', undef }; > my $hold_groups_count = $self->search( $search_params, { group_by => 'me.hold_group_id' } )->count(); >- > return $holds_without_group_count + $hold_groups_count; > } > >diff --git a/circ/view_holdsqueue.pl b/circ/view_holdsqueue.pl >index 4cb5b021ab..7bc73f6da6 100755 >--- a/circ/view_holdsqueue.pl >+++ b/circ/view_holdsqueue.pl >@@ -55,16 +55,6 @@ if ($run_report) { > locationslimit => $locationslimit > } > ); >- for my $item (@$items) { >- my $related_hold = Koha::Holds->search( >- { >- borrowernumber => $item->{borrowernumber}, reservedate => $item->{reservedate}, >- biblionumber => $item->{biblionumber} >- }, >- { order_by => 'reservedate' } >- )->next; >- $item->{hold_group_id} = $related_hold ? $related_hold->hold_group_id : undef; >- } > > $template->param( > branchlimit => $branchlimit, >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/hold-group-modal.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/hold-group-modal.inc >index 8f0f9f7e50..45f957c300 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/hold-group-modal.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/hold-group-modal.inc >@@ -1,14 +1,17 @@ >-<div id="hold-group-modal" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="hold-group-modal-label"> >- <div class="modal-dialog" role="document"> >+<!-- Hold group modal --> >+<div class="modal" id="hold-group-modal" tabindex="-1" role="dialog" aria-labelledby="hold-group-modal-label"> >+ <div class="modal-dialog"> > <div class="modal-content"> > <div class="modal-header"> >- <button type="button" class="closebtn" data-dismiss="modal" aria-hidden="true">Ã</button> >- <h4 class="modal-title" id="hold-group-modal-label">Hold group</h4> >+ <h1 class="modal-title" id="hold-group-modal-label">Hold group</h1> >+ <button type="button" class="btn-close" data-bs-dismiss="modal" aria-hidden="Close"></button> > </div> > <div class="modal-body"> </div> >+ <!-- /.modal-body --> > <div class="modal-footer"> >- <button type="button" class="btn btn-default deny" data-dismiss="modal">Close</button> >- </div> </div >+ <button type="button" class="btn btn-default" data-bs-dismiss="modal">Close</button> >+ </div> >+ <!-- /.modal-footer --> </div > ><!-- /.modal-content --> </div > ><!-- /.modal-dialog --> </div > ><!-- /.modal --> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/view_holdsqueue.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/view_holdsqueue.tt >index 1715cfbf95..8663d96dcb 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/view_holdsqueue.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/view_holdsqueue.tt >@@ -243,7 +243,8 @@ > > > <em>or any available</em> > [% END %] >- [% IF itemsloo.hold_group_id %] >+ [% # NOTE: This will never work as hold_group_id doesn't appear in the tmp_holdsqueue table %] >+ [% IF itemsloo.can('hold_group_id') && ( itemsloo.hold_group_id ) %] > <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> > [% END %] > </td> >-- >2.39.5
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 15516
:
46392
|
47498
|
47570
|
47961
|
47962
|
47963
|
48097
|
48098
|
48448
|
48449
|
50094
|
50095
|
50096
|
53742
|
53743
|
53744
|
53770
|
53771
|
53772
|
53774
|
53775
|
53776
|
54977
|
55300
|
55304
|
55305
|
55306
|
55307
|
55308
|
55768
|
55769
|
55770
|
55771
|
55772
|
58799
|
58800
|
58801
|
58802
|
58803
|
59314
|
59315
|
59316
|
59317
|
59318
|
69902
|
69903
|
69904
|
69905
|
69906
|
72485
|
72486
|
72487
|
72488
|
72489
|
72491
|
79077
|
79078
|
79080
|
79081
|
79082
|
79083
|
79213
|
79214
|
79215
|
79216
|
79217
|
79218
|
79219
|
79220
|
79221
|
79222
|
81453
|
81454
|
81455
|
81456
|
81457
|
81458
|
81459
|
81460
|
81461
|
81462
|
81463
|
84554
|
84555
|
84556
|
84557
|
84558
|
84559
|
84560
|
84561
|
84562
|
84563
|
84564
|
87828
|
87829
|
87830
|
87831
|
87832
|
87833
|
87834
|
87835
|
87836
|
87837
|
87838
|
88038
|
88039
|
88125
|
88173
|
88174
|
88175
|
88176
|
88177
|
88178
|
88179
|
88180
|
88181
|
88182
|
88183
|
88184
|
88185
|
88186
|
90289
|
90290
|
90291
|
90292
|
90293
|
90294
|
90295
|
90296
|
90297
|
90298
|
90299
|
90300
|
90301
|
90302
|
90303
|
90829
|
90830
|
90831
|
90832
|
90833
|
90834
|
90835
|
90836
|
90837
|
90838
|
90839
|
90840
|
90841
|
90842
|
90843
|
90844
|
92783
|
92784
|
92785
|
92786
|
92787
|
92788
|
92789
|
92790
|
92791
|
92792
|
92793
|
92794
|
92795
|
92796
|
92797
|
92798
|
114513
|
114514
|
114515
|
114516
|
114517
|
114518
|
114585
|
114586
|
114603
|
114624
|
114625
|
114626
|
114627
|
114628
|
114629
|
114630
|
114631
|
114632
|
114633
|
114634
|
114635
|
114636
|
114637
|
114638
|
114639
|
114640
|
114641
|
114642
|
114643
|
114644
|
114645
|
114647
|
114648
|
114649
|
114650
|
114651
|
114652
|
114653
|
114654
|
114655
|
114656
|
114657
|
114658
|
114659
|
117423
|
117424
|
117425
|
117426
|
118281
|
118282
|
118283
|
118284
|
118285
|
118286
|
118350
|
118351
|
118352
|
118353
|
118354
|
118355
|
120368
|
120369
|
120370
|
120371
|
120372
|
120373
|
120574
|
120643
|
120644
|
120645
|
120646
|
120647
|
120648
|
120649
|
120650
|
120651
|
121523
|
121623
|
122097
|
122102
|
122627
|
128189
|
128190
|
128191
|
128192
|
128193
|
128194
|
128195
|
128196
|
128197
|
128198
|
128199
|
128200
|
128201
|
128202
|
128255
|
128256
|
128257
|
128258
|
128259
|
128260
|
128261
|
128262
|
128263
|
128264
|
128265
|
128266
|
128267
|
128268
|
128269
|
128285
|
128286
|
128287
|
128288
|
128289
|
128290
|
128291
|
128292
|
128293
|
128294
|
128295
|
128296
|
128297
|
128298
|
128299
|
138576
|
138577
|
138578
|
138579
|
138580
|
138581
|
138582
|
138583
|
138584
|
138585
|
138586
|
138587
|
138588
|
138589
|
138593
|
138594
|
138595
|
138596
|
138597
|
138738
|
138739
|
138740
|
138741
|
138742
|
138772
|
138868
|
138869
|
162076
|
162077
|
162078
|
162079
|
162080
|
162081
|
162082
|
162083
|
162084
|
183876
|
183877
|
183878
|
183879
|
183880
|
183915
|
184047
|
184048
|
184050
|
184051
|
184052
|
184053
|
184054
|
184055
|
184056
|
184057
|
184058
|
184066
|
184530
|
184534
|
185135
|
185456
|
185457
|
185458
|
185459
|
185460
|
185461
|
185462
|
185463
|
185464
|
185465
|
185466
|
185492
|
185509