Bugzilla – Attachment 145542 Details for
Bug 31028
Add 'Report a concern' feature for patrons to report concerns about catalog records
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 31028: (QA follow-up) Fix misc QA issues
Bug-31028-QA-follow-up-Fix-misc-QA-issues.patch (text/plain), 11.39 KB, created by
Kyle M Hall (khall)
on 2023-01-20 16:55:14 UTC
(
hide
)
Description:
Bug 31028: (QA follow-up) Fix misc QA issues
Filename:
MIME Type:
Creator:
Kyle M Hall (khall)
Created:
2023-01-20 16:55:14 UTC
Size:
11.39 KB
patch
obsolete
>From 2156aa7c3d7e2d126cb1899263d8f6d80189dbae Mon Sep 17 00:00:00 2001 >From: Kyle Hall <kyle@bywatersolutions.com> >Date: Fri, 20 Jan 2023 11:52:47 -0500 >Subject: [PATCH] Bug 31028: (QA follow-up) Fix misc QA issues > >--- > Koha/Schema/Result/TicketUpdate.pm | 2 +- > installer/data/mysql/atomicupdate/bug_31028.pl | 18 +++++++++--------- > .../data/mysql/en/mandatory/sample_notices.yml | 8 ++++---- > .../en/includes/modals/add_catalog_concern.inc | 2 +- > .../prog/en/modules/catalogue/detail.tt | 2 +- > .../prog/en/modules/cataloguing/concerns.tt | 2 +- > .../en/includes/modals/catalog_concern.inc | 2 +- > 7 files changed, 18 insertions(+), 18 deletions(-) > >diff --git a/Koha/Schema/Result/TicketUpdate.pm b/Koha/Schema/Result/TicketUpdate.pm >index edbc984ee4..fe4373322a 100644 >--- a/Koha/Schema/Result/TicketUpdate.pm >+++ b/Koha/Schema/Result/TicketUpdate.pm >@@ -147,6 +147,6 @@ __PACKAGE__->belongs_to( > # Created by DBIx::Class::Schema::Loader v0.07049 @ 2022-10-24 18:31:28 > # DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:8YG3jhlqbHWptc28pvBmrg > >+__PACKAGE__->add_columns( '+public' => { is_boolean => 1 } ); > >-# You can replace this text with custom code or comments, and it will be preserved on regeneration > 1; >diff --git a/installer/data/mysql/atomicupdate/bug_31028.pl b/installer/data/mysql/atomicupdate/bug_31028.pl >index 46ae3146d3..b9f5772ce4 100644 >--- a/installer/data/mysql/atomicupdate/bug_31028.pl >+++ b/installer/data/mysql/atomicupdate/bug_31028.pl >@@ -48,8 +48,8 @@ return { > $dbh->do( > q{ > INSERT IGNORE INTO systempreferences ( `variable`, `value`, `options`, `explanation`, `type` ) VALUES >- ('OpacCatalogConcerns', '0', NULL, 'Allow logged in OPAC users to report catalog concerns', 'YesNo') >- } >+ ('OpacCatalogConcerns', '0', NULL, 'Allow logged in OPAC users to report catalog concerns', 'YesNo') >+ } > ); > say $out "`OpacCatalogConcerns` preference added"; > >@@ -89,7 +89,7 @@ return { > $dbh->do( > q{ > INSERT IGNORE INTO letter(module,code,branchcode,name,is_html,title,content,message_transport_type) >- VALUES ( 'catalogue', 'TICKET_ACKNOWLEDGE', '', 'Concern acknowledgement', '1', 'Catalog concern acknowledgement', "Dear [%- INCLUDE 'patron-title.inc' patron => ticket.reporter -%],<br><br>Thankyou for your report concerning [%- INCLUDE 'biblio-title.inc' biblio=ticket.biblio link = 0 -%].<br><br>You reported: <br>[%- ticket.body -%]<br><br>Thankyou", 'email' ); >+ VALUES ( 'catalogue', 'TICKET_ACKNOWLEDGE', '', 'Concern acknowledgement', '1', 'Catalog concern acknowledgement', "Dear [%- INCLUDE 'patron-title.inc' patron => ticket.reporter -%],<br><br>Thank you for your report concerning [%- INCLUDE 'biblio-title.inc' biblio=ticket.biblio link = 0 -%].<br><br>You reported: <br>[%- ticket.body -%]<br><br>Thank you", 'email' ); > } > ); > say $out "Added new notice 'TICKET_ACKNOWLEDGE'"; >@@ -97,7 +97,7 @@ return { > $dbh->do( > q{ > INSERT IGNORE INTO letter(module,code,branchcode,name,is_html,title,content,message_transport_type) >- VALUES ( 'catalogue', 'TICKET_UPDATE', '', 'Concern updated', '1', 'Catalog concern updated', "Dear [%- INCLUDE 'patron-title.inc' patron => ticket_update.ticket.reporter -%],<br><br>The library has added an update to the concern you reported against [%- INCLUDE 'biblio-title.inc' biblio=ticket_update.ticket.biblio link = 0 -%].<br><br>The following comment was left: <br>[%- ticket_update.message -%]<br><br>Thankyou", 'email' ); >+ VALUES ( 'catalogue', 'TICKET_UPDATE', '', 'Concern updated', '1', 'Catalog concern updated', "Dear [%- INCLUDE 'patron-title.inc' patron => ticket_update.ticket.reporter -%],<br><br>The library has added an update to the concern you reported against [%- INCLUDE 'biblio-title.inc' biblio=ticket_update.ticket.biblio link = 0 -%].<br><br>The following comment was left: <br>[%- ticket_update.message -%]<br><br>Thank you", 'email' ); > } > ); > say $out "Added new notice 'TICKET_UPDATE'"; >@@ -105,7 +105,7 @@ return { > $dbh->do( > q{ > INSERT IGNORE INTO letter(module,code,branchcode,name,is_html,title,content,message_transport_type) >- VALUES ( 'catalogue', 'TICKET_RESOLVE', '', 'Concern resolved', '1', 'Catalog concern resolved', "Dear [%- INCLUDE 'patron-title.inc' patron => ticket_update.ticket.reporter -%],<br><br>The library has now marked your concern with [%- INCLUDE 'biblio-title.inc' biblio=ticket_update.ticket.biblio link = 0 -%]as resolved.<br><br>The following comment was left: <br>[%- ticket_update.message -%]<br><br>Thankyou", 'email' ); >+ VALUES ( 'catalogue', 'TICKET_RESOLVE', '', 'Concern resolved', '1', 'Catalog concern resolved', "Dear [%- INCLUDE 'patron-title.inc' patron => ticket_update.ticket.reporter -%],<br><br>The library has now marked your concern with [%- INCLUDE 'biblio-title.inc' biblio=ticket_update.ticket.biblio link = 0 -%]as resolved.<br><br>The following comment was left: <br>[%- ticket_update.message -%]<br><br>Thank you", 'email' ); > } > ); > say $out "Added new notice 'TICKET_RESOLVE'"; >@@ -113,8 +113,8 @@ return { > $dbh->do( > q{ > INSERT IGNORE INTO systempreferences ( `variable`, `value`, `options`, `explanation`, `type` ) VALUES >- ('CatalogerEmails', '', '', 'Notify these catalogers by email when a catalog concern is submitted', 'free') >- } >+ ('CatalogerEmails', '', '', 'Notify these catalogers by email when a catalog concern is submitted', 'free') >+ } > ); > say $out "`CatalogerEmails` preference added"; > >@@ -129,8 +129,8 @@ return { > $dbh->do( > q{ > INSERT IGNORE INTO systempreferences ( `variable`, `value`, `options`, `explanation`, `type` ) VALUES >- ('CatalogConcerns', '0', NULL, 'Allow users to report catalog concerns', 'YesNo') >- } >+ ('CatalogConcerns', '0', NULL, 'Allow users to report catalog concerns', 'YesNo') >+ } > ); > say $out "`CatalogConcerns` preference added"; > } >diff --git a/installer/data/mysql/en/mandatory/sample_notices.yml b/installer/data/mysql/en/mandatory/sample_notices.yml >index 0ca3a78e73..e7a268e242 100644 >--- a/installer/data/mysql/en/mandatory/sample_notices.yml >+++ b/installer/data/mysql/en/mandatory/sample_notices.yml >@@ -54,12 +54,12 @@ tables: > content: > - "Dear [%- INCLUDE 'patron-title.inc' patron => ticket.reporter -%],<br>" > - "<br>" >- - "Thankyou for your report concerning [%- INCLUDE 'biblio-title.inc' biblio=ticket.biblio link = 0 -%].<br>" >+ - "Thank you for your report concerning [%- INCLUDE 'biblio-title.inc' biblio=ticket.biblio link = 0 -%].<br>" > - "<br>" > - "You reported: <br>" > - "[%- ticket.body -%]<br>" > - "<br>" >- - "Thankyou" >+ - "Thank you" > > - module: catalogue > code: TICKET_RESOLVE >@@ -77,7 +77,7 @@ tables: > - "The following comment was left: <br>" > - "[%- ticket_update.message -%]<br>" > - "<br>" >- - "Thankyou" >+ - "Thank you" > > - module: catalogue > code: TICKET_UPDATE >@@ -95,7 +95,7 @@ tables: > - "The following comment was left: <br>" > - "[%- ticket_update.message -%]<br>" > - "<br>" >- - "Thankyou" >+ - "Thank you" > > - module: catalogue > code: TICKET_NOTIFY >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/modals/add_catalog_concern.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/modals/add_catalog_concern.inc >index beb3758b67..38e59ff45f 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/modals/add_catalog_concern.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/modals/add_catalog_concern.inc >@@ -42,7 +42,7 @@ > </fieldset> > </div> <!-- /.modal-body --> > <div class="modal-footer"> >- <input type="hidden" id="concern_biblio" name="biblio_id" value="[% biblionumber %]"> >+ <input type="hidden" id="concern_biblio" name="biblio_id" value="[% biblionumber | html %]"> > <button type="submit" class="btn btn-primary" id="addConfirm">Submit <i id="concern-submit-spinner" class="fa fa-spinner fa-pulse fa-fw" style="display:none"></i></button> > <button type="button" class="btn btn-default" data-dismiss="modal">Cancel</button> > </div> <!-- /.modal-footer --> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt >index a43744e588..8e099822a9 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt >@@ -1361,7 +1361,7 @@ Note that permanent location is a code, and location may be an authval. > "resolver", > "updates+count", > ], >- 'emptyTable': '<div class="dialog message">' + _("Congradulations, there are no catalog concerns.") + '</div>', >+ 'emptyTable': '<div class="dialog message">' + _("Congratulations, there are no catalog concerns.") + '</div>', > "columnDefs": [ { > "targets": [0,1,2], > "render": function (data, type, row, meta) { >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/concerns.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/concerns.tt >index 4105642136..0da66460fa 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/concerns.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/concerns.tt >@@ -89,7 +89,7 @@ > "biblio", > "updates+count", > ], >- 'emptyTable': '<div class="dialog message">' + _("Congradulations, there are no catalog concerns.") + '</div>', >+ 'emptyTable': '<div class="dialog message">' + _("Congratulations, there are no catalog concerns.") + '</div>', > "columnDefs": [{ > "targets": [0, 1, 2, 3], > "render": function(data, type, row, meta) { >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/modals/catalog_concern.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/modals/catalog_concern.inc >index 432f8d1df2..8fbe0389e8 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/modals/catalog_concern.inc >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/modals/catalog_concern.inc >@@ -18,7 +18,7 @@ > <input type="text" name="concern_title" id="concern_title" required="required"/> > </div> > <div class="form-group"> >- <label for="concern_body">Please decribe your concerns: </label> >+ <label for="concern_body">Please describe your concerns: </label> > <textarea class="form-control" name="concern_body" id="concern_body" aria-describedby="helpBlock" required="required" rows="15"></textarea> > [%- IF CatalogConcernHelp && CatalogConcernHelp.content && CatalogConcernHelp.content.count > 0 -%] > <div class="help-block"> >-- >2.30.2
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 31028
:
137412
|
139222
|
139223
|
139224
|
139225
|
139226
|
139227
|
139228
|
139229
|
139230
|
139231
|
139232
|
139233
|
139234
|
139235
|
139236
|
139237
|
139238
|
139572
|
139573
|
139574
|
139575
|
139576
|
139577
|
139578
|
139579
|
139580
|
139581
|
139582
|
139583
|
139584
|
139585
|
139586
|
139587
|
139588
|
139589
|
139590
|
139591
|
140289
|
140290
|
140291
|
140292
|
140293
|
140294
|
140295
|
140296
|
140297
|
140298
|
140299
|
140300
|
140301
|
140302
|
140303
|
140304
|
140305
|
140306
|
140307
|
140308
|
140436
|
140437
|
140438
|
140439
|
140440
|
140441
|
140442
|
140443
|
140444
|
140445
|
140446
|
140447
|
140448
|
140449
|
140450
|
140451
|
140452
|
140453
|
140454
|
140455
|
140764
|
140765
|
140766
|
140767
|
140768
|
140769
|
140770
|
140771
|
140772
|
140773
|
140774
|
140775
|
140776
|
140777
|
140778
|
140779
|
140780
|
140781
|
140782
|
140783
|
140793
|
140929
|
140930
|
140931
|
140932
|
140933
|
140934
|
140935
|
140936
|
140937
|
140938
|
140939
|
140940
|
140941
|
140942
|
140943
|
140944
|
140945
|
140946
|
140947
|
140948
|
140949
|
140950
|
141133
|
141134
|
141135
|
141136
|
141137
|
141138
|
141139
|
141140
|
141141
|
141142
|
141143
|
141144
|
141145
|
141146
|
141147
|
141148
|
141149
|
141150
|
141151
|
141152
|
141153
|
141154
|
141440
|
141441
|
141442
|
141443
|
141444
|
141445
|
141446
|
141447
|
141448
|
141449
|
141450
|
141451
|
141452
|
141453
|
141454
|
141455
|
141456
|
141457
|
141458
|
141459
|
141460
|
142164
|
142165
|
142166
|
142167
|
142168
|
142169
|
142170
|
142171
|
142172
|
142173
|
142174
|
142175
|
142177
|
142179
|
142180
|
142181
|
142182
|
142183
|
142184
|
142185
|
142186
|
142187
|
142188
|
142189
|
142190
|
142191
|
142616
|
142617
|
142618
|
142619
|
142620
|
142621
|
142622
|
142623
|
142624
|
142625
|
142626
|
142627
|
142932
|
142933
|
142934
|
142935
|
142936
|
142937
|
142938
|
142939
|
142940
|
142941
|
142942
|
142943
|
142944
|
142945
|
142946
|
142947
|
142948
|
142949
|
143238
|
143239
|
143240
|
143241
|
143242
|
143243
|
143244
|
143245
|
143246
|
143247
|
143248
|
143249
|
143250
|
143251
|
143252
|
143253
|
143254
|
143255
|
143256
|
143257
|
143302
|
143303
|
143304
|
143305
|
143306
|
143307
|
143308
|
143309
|
143310
|
143311
|
143312
|
143313
|
143314
|
143315
|
143316
|
143317
|
143318
|
143319
|
143320
|
143321
|
143322
|
143323
|
143324
|
143325
|
143326
|
143327
|
143328
|
143329
|
143330
|
143331
|
143332
|
143333
|
143334
|
143335
|
143336
|
143337
|
143338
|
143339
|
143340
|
143341
|
143470
|
143471
|
143472
|
143473
|
143474
|
143475
|
143476
|
143477
|
143478
|
143479
|
143480
|
143481
|
143482
|
143483
|
143484
|
143485
|
143486
|
143487
|
143488
|
143489
|
143490
|
143647
|
143648
|
143649
|
143650
|
143651
|
143652
|
143653
|
143654
|
143655
|
143656
|
143657
|
143658
|
143659
|
143660
|
143661
|
143662
|
143663
|
143664
|
143665
|
143666
|
143667
|
143708
|
143709
|
143710
|
143711
|
143712
|
143713
|
143714
|
143715
|
143716
|
143717
|
143718
|
143719
|
143720
|
143721
|
143722
|
143723
|
143724
|
143725
|
143726
|
143727
|
144647
|
144648
|
144649
|
144650
|
144651
|
144652
|
144653
|
144654
|
144655
|
144656
|
144657
|
144658
|
144659
|
144660
|
144661
|
144662
|
144663
|
144664
|
144665
|
144666
|
144667
|
144668
|
145542
|
146214
|
146215
|
146216
|
146217
|
146218
|
146219
|
146220
|
146221
|
146222
|
146223
|
146224
|
146225
|
146226
|
146227
|
146228
|
146229
|
146230
|
146231
|
146232
|
146233
|
146234
|
146235
|
146236
|
146237
|
146238
|
146239
|
146240
|
146241
|
146242
|
146243
|
146244
|
146245
|
146246
|
146247
|
146248
|
146249
|
146250
|
146251
|
146252
|
146253
|
146254
|
146255
|
146256
|
146257
|
146258
|
146259
|
146260
|
146261
|
146262
|
146697
|
146870
|
146871
|
146872
|
146873
|
146874
|
146875
|
146876
|
146877
|
146878
|
146879
|
146880
|
146881
|
146882
|
146883
|
146884
|
146885
|
146886
|
146887
|
146888
|
146889
|
146890
|
146891
|
146892
|
146893
|
146894
|
146895
|
146896
|
147797
|
147840
|
147841
|
147844
|
147859
|
147860
|
147861
|
147866
|
148673
|
149931