Bugzilla – Attachment 114516 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) Fixing modal view and more
Bug-15516-follow-up-Fixing-modal-view-and-more.patch (text/plain), 7.43 KB, created by
Josef Moravec
on 2020-12-18 11:00:24 UTC
(
hide
)
Description:
Bug 15516: (follow-up) Fixing modal view and more
Filename:
MIME Type:
Creator:
Josef Moravec
Created:
2020-12-18 11:00:24 UTC
Size:
7.43 KB
patch
obsolete
>From 991d0abd5e4eb4410756fd13c6458f489efe4d94 Mon Sep 17 00:00:00 2001 >From: Aleisha Amohia <aleishaamohia@hotmail.com> >Date: Tue, 16 Apr 2019 02:30:04 +0000 >Subject: [PATCH] Bug 15516: (follow-up) Fixing modal view and more > >Fixing >- modal view >- missed changes from 'reserve group' to 'hold group' >- updating atomic update to perl >- utf8mb4 > >Signed-off-by: Michal Denar <black23@gmail.com> >--- > installer/data/mysql/atomicupdate/bug_15516.sql | 11 ------- > .../atomicupdate/bug_15516_-_hold_group_table.perl | 34 ++++++++++++++++++++++ > installer/data/mysql/kohastructure.sql | 2 +- > .../prog/en/includes/hold-group-modal.inc | 6 ++-- > .../prog/en/modules/circ/circulation.tt | 2 +- > reserve/placerequest.pl | 2 +- > 6 files changed, 40 insertions(+), 17 deletions(-) > delete mode 100644 installer/data/mysql/atomicupdate/bug_15516.sql > create mode 100644 installer/data/mysql/atomicupdate/bug_15516_-_hold_group_table.perl > >diff --git a/installer/data/mysql/atomicupdate/bug_15516.sql b/installer/data/mysql/atomicupdate/bug_15516.sql >deleted file mode 100644 >index bc2c0598f3..0000000000 >--- a/installer/data/mysql/atomicupdate/bug_15516.sql >+++ /dev/null >@@ -1,11 +0,0 @@ >-DROP TABLE IF EXISTS hold_group; >-CREATE TABLE hold_group ( >- hold_group_id int unsigned NOT NULL AUTO_INCREMENT, >- PRIMARY KEY (hold_group_id) >-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; >- >-ALTER TABLE reserves ADD COLUMN hold_group_id int unsigned NULL DEFAULT NULL; >-ALTER TABLE reserves ADD CONSTRAINT reserves_ibfk_6 FOREIGN KEY (hold_group_id) REFERENCES hold_group (hold_group_id) ON DELETE SET NULL ON UPDATE CASCADE; >- >-ALTER TABLE old_reserves ADD COLUMN hold_group_id int unsigned NULL DEFAULT NULL; >-ALTER TABLE old_reserves ADD CONSTRAINT old_reserves_ibfk_5 FOREIGN KEY (hold_group_id) REFERENCES hold_group (hold_group_id) ON DELETE SET NULL ON UPDATE CASCADE; >diff --git a/installer/data/mysql/atomicupdate/bug_15516_-_hold_group_table.perl b/installer/data/mysql/atomicupdate/bug_15516_-_hold_group_table.perl >new file mode 100644 >index 0000000000..a968ea601b >--- /dev/null >+++ b/installer/data/mysql/atomicupdate/bug_15516_-_hold_group_table.perl >@@ -0,0 +1,34 @@ >+$DBversion = 'XXX'; >+if( CheckVersion( $DBversion ) ) { >+ >+ if( TableExists( 'hold_group' ) ){ >+ $dbh->do(q{UPDATE reserves SET hold_group_id = NULL}); >+ $dbh->do(q{UPDATE old_reserves SET hold_group_id = NULL}); >+ >+ $dbh->do(q{ALTER TABLE reserves DROP FOREIGN KEY reserves_ibfk_6}); >+ $dbh->do(q{ALTER TABLE old_reserves DROP FOREIGN KEY old_reserves_ibfk_5}); >+ >+ $dbh->do(q{DROP TABLE hold_group}); >+ $dbh->do(q{CREATE TABLE hold_group ( >+ hold_group_id int unsigned NOT NULL AUTO_INCREMENT, >+ PRIMARY KEY (hold_group_id) >+ ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci}); >+ } >+ >+ unless( column_exists( 'reserves', 'hold_group_id' ) ){ >+ $dbh->do(q{ALTER TABLE reserves ADD COLUMN hold_group_id int unsigned NULL DEFAULT NULL}); >+ } >+ unless( column_exists( 'old_reserves', 'hold_group_id') ){ >+ $dbh->do(q{ALTER TABLE old_reserves ADD COLUMN hold_group_id int unsigned NULL DEFAULT NULL}); >+ } >+ >+ unless( foreign_key_exists( 'reserves', 'reserves_ibfk_6' ) ){ >+ $dbh->do(q{ALTER TABLE reserves ADD CONSTRAINT reserves_ibfk_6 FOREIGN KEY (hold_group_id) REFERENCES hold_group (hold_group_id) ON DELETE SET NULL ON UPDATE CASCADE}); >+ } >+ unless( foreign_key_exists( 'old_reserves', 'old_reserves_ibfk_5' ) ){ >+ $dbh->do(q{ALTER TABLE old_reserves ADD CONSTRAINT old_reserves_ibfk_5 FOREIGN KEY (hold_group_id) REFERENCES hold_group (hold_group_id) ON DELETE SET NULL ON UPDATE CASCADE}); >+ } >+ >+ SetVersion( $DBversion ); >+ print "Upgrade to $DBversion done (Bug 15516 - Adding hold group table)\n"; >+} >diff --git a/installer/data/mysql/kohastructure.sql b/installer/data/mysql/kohastructure.sql >index 058f838c52..c21b0d19e7 100644 >--- a/installer/data/mysql/kohastructure.sql >+++ b/installer/data/mysql/kohastructure.sql >@@ -1885,7 +1885,7 @@ CREATE TABLE `old_reserves` ( -- this table holds all holds/reserves that have b > ON DELETE SET NULL ON UPDATE SET NULL, > CONSTRAINT `old_reserves_ibfk_4` FOREIGN KEY (`itemtype`) REFERENCES `itemtypes` (`itemtype`) > ON DELETE SET NULL ON UPDATE SET NULL, >- CONSTRAINT `old_reserves_ibfk_5` FOREIGN KEY (hold_group_id) REFERENCES hold_group (hold_group_id) >+ CONSTRAINT `old_reserves_ibfk_5` FOREIGN KEY (`hold_group_id`) REFERENCES `hold_group` (`hold_group_id`) > ON DELETE SET NULL ON UPDATE CASCADE > ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; > >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 2590b9db80..fcd45c99f6 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,15 +1,15 @@ >-<div id="hold-group-modal" class="modal hide" tabindex="-1" role="dialog" aria-labelledby="hold-group-modal-label" aria-hidden="true"> >+<div id="hold-group-modal" class="modal fade" tabindex="-1" role="dialog"> > <div class="modal-dialog" role="document"> > <div class="modal-content"> > <div class="modal-header"> > <button type="button" class="closebtn" data-dismiss="modal" aria-hidden="true">Ã</button> >- <h3 id="hold-group-modal-label">Hold group</h3> >+ <h4 class="modal-title">Hold group</h3> > </div> > <div class="modal-body"> > <div id="loading"> <img src="[% interface | html %]/[% theme | html %]/img/loading-small.gif" alt="" /> Loading </div> > </div> > <div class="modal-footer"> >- <button class="btn" data-dismiss="modal" aria-hidden="true">Close</button> >+ <button type="button" class="btn btn-default deny" data-dismiss="modal">Close</button> > </div> > </div><!-- /.modal-content --> > </div><!-- /.modal-dialog --> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt >index 152966f4b4..acca23e415 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt >@@ -1101,7 +1101,7 @@ > [% Asset.js("js/checkouts.js") | $raw %] > [% Asset.js("js/holds.js") | $raw %] > [% Asset.js("js/circ-patron-search-results.js") | $raw %] >- [% Asset.js("js/hold-group.js" | $raw %] >+ [% Asset.js("js/hold-group.js") | $raw %] > <script> > columns_settings_issues_table = [% TablesSettings.GetColumns( 'circ', 'circulation', 'issues-table', 'json' ) | $raw %] > columns_settings_borrowers_table = [% TablesSettings.GetColumns( 'circ', 'circulation', 'table_borrowers', 'json' ) | $raw %] >diff --git a/reserve/placerequest.pl b/reserve/placerequest.pl >index 888a8fb57c..768c713f9f 100755 >--- a/reserve/placerequest.pl >+++ b/reserve/placerequest.pl >@@ -144,7 +144,7 @@ if ( $type eq 'str8' && $borrower ) { > found => $found, > itemtype => $itemtype, > non_priority => $non_priority, >- reserve_group_id => $reserve_group_id, >+ hold_group_id => $hold_group_id, > } > ); > } >-- >2.11.0
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