From 2156aa7c3d7e2d126cb1899263d8f6d80189dbae Mon Sep 17 00:00:00 2001 From: Kyle Hall 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 -%],

Thankyou for your report concerning [%- INCLUDE 'biblio-title.inc' biblio=ticket.biblio link = 0 -%].

You reported:
[%- ticket.body -%]

Thankyou", 'email' ); + VALUES ( 'catalogue', 'TICKET_ACKNOWLEDGE', '', 'Concern acknowledgement', '1', 'Catalog concern acknowledgement', "Dear [%- INCLUDE 'patron-title.inc' patron => ticket.reporter -%],

Thank you for your report concerning [%- INCLUDE 'biblio-title.inc' biblio=ticket.biblio link = 0 -%].

You reported:
[%- ticket.body -%]

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 -%],

The library has added an update to the concern you reported against [%- INCLUDE 'biblio-title.inc' biblio=ticket_update.ticket.biblio link = 0 -%].

The following comment was left:
[%- ticket_update.message -%]

Thankyou", 'email' ); + VALUES ( 'catalogue', 'TICKET_UPDATE', '', 'Concern updated', '1', 'Catalog concern updated', "Dear [%- INCLUDE 'patron-title.inc' patron => ticket_update.ticket.reporter -%],

The library has added an update to the concern you reported against [%- INCLUDE 'biblio-title.inc' biblio=ticket_update.ticket.biblio link = 0 -%].

The following comment was left:
[%- ticket_update.message -%]

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 -%],

The library has now marked your concern with [%- INCLUDE 'biblio-title.inc' biblio=ticket_update.ticket.biblio link = 0 -%]as resolved.

The following comment was left:
[%- ticket_update.message -%]

Thankyou", 'email' ); + VALUES ( 'catalogue', 'TICKET_RESOLVE', '', 'Concern resolved', '1', 'Catalog concern resolved', "Dear [%- INCLUDE 'patron-title.inc' patron => ticket_update.ticket.reporter -%],

The library has now marked your concern with [%- INCLUDE 'biblio-title.inc' biblio=ticket_update.ticket.biblio link = 0 -%]as resolved.

The following comment was left:
[%- ticket_update.message -%]

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 -%],
" - "
" - - "Thankyou for your report concerning [%- INCLUDE 'biblio-title.inc' biblio=ticket.biblio link = 0 -%].
" + - "Thank you for your report concerning [%- INCLUDE 'biblio-title.inc' biblio=ticket.biblio link = 0 -%].
" - "
" - "You reported:
" - "[%- ticket.body -%]
" - "
" - - "Thankyou" + - "Thank you" - module: catalogue code: TICKET_RESOLVE @@ -77,7 +77,7 @@ tables: - "The following comment was left:
" - "[%- ticket_update.message -%]
" - "
" - - "Thankyou" + - "Thank you" - module: catalogue code: TICKET_UPDATE @@ -95,7 +95,7 @@ tables: - "The following comment was left:
" - "[%- ticket_update.message -%]
" - "
" - - "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 @@ 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': '
' + _("Congradulations, there are no catalog concerns.") + '
', + 'emptyTable': '
' + _("Congratulations, there are no catalog concerns.") + '
', "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': '
' + _("Congradulations, there are no catalog concerns.") + '
', + 'emptyTable': '
' + _("Congratulations, there are no catalog concerns.") + '
', "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 @@
- + [%- IF CatalogConcernHelp && CatalogConcernHelp.content && CatalogConcernHelp.content.count > 0 -%]
-- 2.30.2