Bugzilla – Attachment 167468 Details for
Bug 36453
BlockExpiredPatronOpacActions should allow multiple actions options
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 36453: (QA follow-up): Cosmetic fixes
Bug-36453-QA-follow-up-Cosmetic-fixes.patch (text/plain), 7.37 KB, created by
Martin Renvoize (ashimema)
on 2024-06-05 16:08:00 UTC
(
hide
)
Description:
Bug 36453: (QA follow-up): Cosmetic fixes
Filename:
MIME Type:
Creator:
Martin Renvoize (ashimema)
Created:
2024-06-05 16:08:00 UTC
Size:
7.37 KB
patch
obsolete
>From 8ffe7218c6cf56967ab8950847a2208f1256051b Mon Sep 17 00:00:00 2001 >From: Pedro Amorim <pedro.amorim@ptfs-europe.com> >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 <martin.renvoize@ptfs-europe.com> >--- > 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 08542a8dd1c..afcf0473547 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 6a98f023e81..1ee991303d3 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 4834ac4e773..215f41dba3e 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 %] > </select> > </li> >- <li><label for="block_expired">Block expired patrons actions:</label> >+ <li><label for="block_expired">Block expired patron OPAC actions:</label> > <select name="BlockExpiredPatronOpacActions" id="block_expired" multiple="multiple"> > <optgroup label="Follow system preference"> >- [% IF not category or category.BlockExpiredPatronOpacActions_contains('follow_syspref_BlockExpiredPatronOpacActions') %] >- <option value="follow_syspref_BlockExpiredPatronOpacActions" selected="selected"> Follow system preference BlockExpiredPatronOpacActions </option> >+ [% IF category and category.BlockExpiredPatronOpacActions_contains('follow_syspref_BlockExpiredPatronOpacActions') %] >+ <option value="follow_syspref_BlockExpiredPatronOpacActions" selected="selected"> Block actions specified in BlockExpiredPatronOpacActions </option> > [% ELSE %] >- <option value="follow_syspref_BlockExpiredPatronOpacActions"> BlockExpiredPatronOpacActions </option> >+ <option value="follow_syspref_BlockExpiredPatronOpacActions"> Block actions in BlockExpiredPatronOpacActions </option> > [% END %] > </optgroup> >- <optgroup label="Specific actions"> >+ <optgroup label="Block specific actions"> > [% IF category and category.BlockExpiredPatronOpacActions_contains('hold') %] > <option value="hold" selected="selected"> Placing a hold on an item </option> > [% ELSE %] >@@ -364,8 +364,7 @@ > </optgroup> > </select> > <div class="hint"> >- Choose whether patrons of this category be blocked from public catalog actions such as renewing and placing holds when their cards have expired. >- </div> >+ Choose which OPAC actions, if any, are blocked for expired patrons of this category. Alternatively, the system preference <a href="/cgi-bin/koha/admin/preferences.pl?tab=&op=search&searchfield=BlockExpiredPatronOpacActions">BlockExpiredPatronOpacActions</a> can be used instead. > </li> > [% IF ( Koha.Preference('CheckPrevCheckout') == 'softyes' || Koha.Preference('CheckPrevCheckout') == 'softno' ) %] > <li><label for="checkprevcheckout">Check for previous checkouts: </label> >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 ee039053e0a..bd646b86d35 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. >+ - "<p>Please note: OPAC actions blocked based on the patron category take priority over this preference.</p>" > - > - The cleanup_database.pl cronjob automatically deletes unaccepted private list share invites after > - pref: PurgeListShareInvitesOlderThan >-- >2.45.1
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 36453
:
164042
|
164043
|
164044
|
164045
|
164046
|
164047
|
164048
|
164762
|
164763
|
164764
|
164765
|
164766
|
164767
|
164768
|
165413
|
165414
|
165454
|
167461
|
167462
|
167463
|
167464
|
167465
|
167466
|
167467
|
167468
|
167469
|
167470
|
167471
|
167472
|
167473
|
167474
|
167475
|
167476
|
167477
|
167478
|
167479
|
167480
|
168435
|
168436