From 9845fb2f42997acd8b76badfa89f371f53fab192 Mon Sep 17 00:00:00 2001 From: Pedro Amorim Date: Tue, 23 Apr 2024 15:50:19 +0000 Subject: [PATCH] Bug 36453: (QA follow-up) Cosmetic fixes This is a squash of several improvements: - Override weird blue color being applied from MultipleSelect when all options from an optgroup are selected; - Fix input width depending on selected value. Now it should always be same width regardless; - Updated the system preference UI wording to reflect new behavior; - Updated UI labels in the patron category edit page to enforce that the actions being selected are "actions to be blocked" - Corrected sysprefs.sql entry Signed-off-by: Martin Renvoize --- installer/data/mysql/mandatory/sysprefs.sql | 2 +- koha-tmpl/intranet-tmpl/prog/css/src/_forms.scss | 5 +++++ .../prog/en/modules/admin/categories.tt | 13 ++++++------- .../prog/en/modules/admin/preferences/opac.pref | 3 ++- 4 files changed, 14 insertions(+), 9 deletions(-) diff --git a/installer/data/mysql/mandatory/sysprefs.sql b/installer/data/mysql/mandatory/sysprefs.sql index 08542a8dd1..afcf047354 100644 --- a/installer/data/mysql/mandatory/sysprefs.sql +++ b/installer/data/mysql/mandatory/sysprefs.sql @@ -117,7 +117,7 @@ INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, ` ('BiblioDefaultView','normal','normal|marc|isbd','Choose the default detail view in the catalog; choose between normal, marc or isbd','Choice'), ('BiblioItemtypeInfo','0','0','Control which itemtype info displays for biblio level itemtypes','YesNo'), ('BibtexExportAdditionalFields', '', NULL , 'Define additional BibTex tags to export from MARC records in YAML format as an associative array with either a marc tag/subfield combination as the value, or a list of tag/subfield combinations.', 'textarea'), -('BlockExpiredPatronOpacActions','','hold,renew','Specific actions expired patrons of this category are blocked from performing or if the BlockExpiredPatronOpacActions system preference is to be followed','multiple'), +('BlockExpiredPatronOpacActions','','hold,renew','Specific actions expired patrons of this category are blocked from performing. OPAC actions blocked based on the patron category take priority over this preference.','multiple'), ('BlockReturnOfLostItems','0','0','If enabled, items that are marked as lost cannot be returned.','YesNo'), ('BlockReturnOfWithdrawnItems','1','0','If enabled, items that are marked as withdrawn cannot be returned.','YesNo'), ('BorrowerMandatoryField','surname|cardnumber',NULL,'Choose the mandatory fields for a patron\'s account','free'), diff --git a/koha-tmpl/intranet-tmpl/prog/css/src/_forms.scss b/koha-tmpl/intranet-tmpl/prog/css/src/_forms.scss index 6a98f023e8..1ee991303d 100644 --- a/koha-tmpl/intranet-tmpl/prog/css/src/_forms.scss +++ b/koha-tmpl/intranet-tmpl/prog/css/src/_forms.scss @@ -179,6 +179,11 @@ fieldset { width:auto; } } + + ul>li.hide-radio.selected { + color: initial; + background-color: initial; + } } } diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categories.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categories.tt index 4834ac4e77..215f41dba3 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categories.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categories.tt @@ -341,16 +341,16 @@ [% END %] -
  • +
  • - Choose whether patrons of this category be blocked from public catalog actions such as renewing and placing holds when their cards have expired. -
    + Choose which OPAC actions, if any, are blocked for expired patrons of this category. Alternatively, the system preference BlockExpiredPatronOpacActions can be used instead.
    • [% IF ( Koha.Preference('CheckPrevCheckout') == 'softyes' || Koha.Preference('CheckPrevCheckout') == 'softno' ) %]
  • diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref index ee039053e0..bd646b86d3 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref @@ -640,11 +640,12 @@ OPAC: 1: Allow - "OPAC users to share private lists with other patrons." - + - "Expired patrons are blocked from performing the following actions in the OPAC:" - pref: BlockExpiredPatronOpacActions multiple: renew: "Renewing an item" hold: "Placing a hold on an item" - - expired patrons from OPAC actions such as placing a hold or renewing. Note that the setting for a patron category takes priority over this system preference. + - "

    Please note: OPAC actions blocked based on the patron category take priority over this preference.

    " - - The cleanup_database.pl cronjob automatically deletes unaccepted private list share invites after - pref: PurgeListShareInvitesOlderThan -- 2.39.5