From 5a7f6b65c3ea4e45967c03c809856c788b9eb83d Mon Sep 17 00:00:00 2001 From: Pedro Amorim Date: Tue, 25 Mar 2025 16:43:11 +0000 Subject: [PATCH] Bug 35604: Multiple QA followups Multiple fixes: - File permmissions - Capitalization - Translatability - Use of console.log - Atomic update description typo fix - Remove occurrences of 'auto' and 'automatic': User testing reported that making a UI distinction between 'regular' and 'automatic' ILL requests is redundant. Signed-off-by: Tomas Cohen Arazi --- Koha/ILL/Backend/intra-includes/create.inc | 6 +----- Koha/ILL/Backend/opac-includes/create.inc | 6 +----- installer/data/mysql/atomicupdate/bug_35604.pl | 4 ++-- installer/data/mysql/mandatory/sysprefs.sql | 2 +- .../intranet-tmpl/prog/en/includes/ill-toolbar.inc | 2 +- koha-tmpl/intranet-tmpl/prog/js/ill-autobackend.js | 10 +++------- .../opac-tmpl/bootstrap/en/modules/opac-illrequests.tt | 2 +- .../opac-tmpl/bootstrap/en/modules/opac-results.tt | 4 ++-- koha-tmpl/opac-tmpl/bootstrap/js/ill-autobackend.js | 10 +++------- t/db_dependent/Koha/ILL/Backends.t | 0 t/db_dependent/Koha/ILL/Request/Workflow/ConfirmAuto.t | 0 11 files changed, 15 insertions(+), 31 deletions(-) mode change 100644 => 100755 installer/data/mysql/atomicupdate/bug_35604.pl mode change 100644 => 100755 t/db_dependent/Koha/ILL/Backends.t mode change 100644 => 100755 t/db_dependent/Koha/ILL/Request/Workflow/ConfirmAuto.t diff --git a/Koha/ILL/Backend/intra-includes/create.inc b/Koha/ILL/Backend/intra-includes/create.inc index 00ed751e05b..7f45536d487 100644 --- a/Koha/ILL/Backend/intra-includes/create.inc +++ b/Koha/ILL/Backend/intra-includes/create.inc @@ -17,11 +17,7 @@ [% END %] [% IF whole.stage == "form" %] -[% IF Koha.Preference('AutoILLBackendPriority') %] -

Create an automatic ILL request

-[% ELSE %] -

Create a manual ILL request

-[% END %] +

Create an ILL request

[% INCLUDE 'csrf-token.inc' %]
diff --git a/Koha/ILL/Backend/opac-includes/create.inc b/Koha/ILL/Backend/opac-includes/create.inc index 72c137c9cc4..1b14f8dd02b 100644 --- a/Koha/ILL/Backend/opac-includes/create.inc +++ b/Koha/ILL/Backend/opac-includes/create.inc @@ -30,11 +30,7 @@ [% SET opac = whole.value.other.opac %] [% IF whole.stage == "form" %] -[% IF Koha.Preference('AutoILLBackendPriority') %] -

Create an automatic ILL request

-[% ELSE %] -

Create a manual ILL request

-[% END %] +

Create an ILL request

[% INCLUDE 'csrf-token.inc' %]
diff --git a/installer/data/mysql/atomicupdate/bug_35604.pl b/installer/data/mysql/atomicupdate/bug_35604.pl old mode 100644 new mode 100755 index cd347bcac85..2979ea49514 --- a/installer/data/mysql/atomicupdate/bug_35604.pl +++ b/installer/data/mysql/atomicupdate/bug_35604.pl @@ -3,13 +3,13 @@ use Koha::Installer::Output qw(say_warning say_success say_info); return { bug_number => "35604", - description => "Add new AutoILLBackendPriority system preferences", + description => "Add new AutoILLBackendPriority system preference", up => sub { my ($args) = @_; my ( $dbh, $out ) = @$args{qw(dbh out)}; $dbh->do( - q{ INSERT IGNORE INTO systempreferences (variable,value,options,explanation,type) VALUES ('AutoILLBackendPriority','',NULL,'Set the automatic backend selection priority','ILLBackends'); } + q{ INSERT IGNORE INTO systempreferences (variable,value,options,explanation,type) VALUES ('AutoILLBackendPriority','',NULL,'Set the automatic backend selection priority','ill-backends'); } ); say_success( $out, "Added new system preference 'AutoILLBackendPriority'" ); }, diff --git a/installer/data/mysql/mandatory/sysprefs.sql b/installer/data/mysql/mandatory/sysprefs.sql index b64d88a6d09..7f35027dc54 100644 --- a/installer/data/mysql/mandatory/sysprefs.sql +++ b/installer/data/mysql/mandatory/sysprefs.sql @@ -93,7 +93,7 @@ INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, ` ('AutoCreateAuthorities','0',NULL,'Automatically create authorities that do not exist when cataloging records.','YesNo'), ('AutoCreditNumber', '', '', 'Automatically generate a number for account credits', 'Choice'), ('AutoEmailNewUser','0',NULL,'Send an email to newly created patrons.','YesNo'), -('AutoILLBackendPriority','',NULL,'Set the automatic backend selection priority','ILLBackends'), +('AutoILLBackendPriority','',NULL,'Set the automatic backend selection priority','ill-backends'), ('AutoLinkBiblios','0',NULL,'If enabled, link biblio to authorities on creation and edit','YesNo'), ('AutomaticCheckinAutoFill','0',NULL,'Automatically fill the next hold with an automatic check in.','YesNo'), ('AutomaticConfirmTransfer','0',NULL,'Defines whether transfers should be automatically confirmed at checkin if modal dismissed','YesNo'), diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/ill-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/ill-toolbar.inc index acf59c9ad8d..1c85da4f629 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/ill-toolbar.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/ill-toolbar.inc @@ -3,7 +3,7 @@
[% IF backends_available %] [% IF Koha.Preference('AutoILLBackendPriority') %] - New auto ILL request + New ILL request [% ELSIF backends.size > 1 %]