Attachment 141222 Details for Bug 31503 – Bug 31503: Configurable consent text

[patch] Bug 31503: Configurable consent text

Bug-31503-Configurable-consent-text.patch (text/plain), 4.12 KB, created by Marcel de Rooy on 2022-10-03 07:01:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Marcel de Rooy

Created: 2022-10-03 07:01:01 UTC

Size: 4.12 KB

patch

obsolete

>From 92db9fcec855ba4f2dcda9aed7e1901f064fdefd Mon Sep 17 00:00:00 2001
>From: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
>Date: Fri, 2 Sep 2022 07:41:27 +0000
>Subject: [PATCH] Bug 31503: Configurable consent text
>Content-Type: text/plain; charset=utf-8
>
>Although I planned to implement this via Additional
>contents (AC), I am using the AV description here after
>all, since AC does not yet provide enough flexibility.
>
>The title on the consents page is constructed from the
>consent type now still, and the description is from the
>OPAC description in AV (PATRON_CONSENT).
>
>Note: AV allows you to add html in the description, although
>it was not meant to do so. When we switch to AC later, we
>will have the possibility of html, languages, title and
>content.
>
>Second note: We still need AV translations too. See
>Bugzilla.
>
>Test plan:
>[1] Add a NEWSLETTER value under AV category PATRON_CONSENT.
>[2] Add no OPAC description. Save. Hit OPAC consents page.
>[3] Add description. Check page again.
>[4] Add html to description. Check again.
>
>Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
>---
> .../bootstrap/en/modules/opac-patron-consent.tt   | 15 +++++++++++----
> 1 file changed, 11 insertions(+), 4 deletions(-)
>
>diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-patron-consent.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-patron-consent.tt
>index 512a0a8078..eef78ecead 100644
>--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-patron-consent.tt
>+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-patron-consent.tt
>@@ -1,5 +1,7 @@
> [% USE Koha %]
> [% USE AdditionalContents %]
>+[% USE AuthorisedValues %]
>+[% USE raw %]
> [% SET OpacNav = AdditionalContents.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode || default_branch, blocktitle => 0 ) %]
> [% SET OpacNavBottom = AdditionalContents.get( location => "OpacNavBottom", lang => lang, library => logged_in_user.branchcode || default_branch, blocktitle => 0 ) %]
> [% SET consentview = 1 %]
>@@ -41,15 +43,20 @@
>                         <input type="hidden" name="op" value="save"/>
>                         <input type="hidden" name="borrowernumber" value="[% patron.borrowernumber | html %]"/>
>                         [% FOREACH consent IN consents %]
>-                            <legend><h2>Consent for [% consent.type | html %]</h2></legend>
>+                            <legend><h2>
>+                                Consent for [% consent.type | html # TODO additional_contents.title %]
>+                            </h2></legend>
>                             <fieldset>
>                                 <ul><li>
>-                                    [% IF consent.type == 'GDPR_PROCESSING' %]
>+                                    [% description = AuthorisedValues.GetByCode( 'PATRON_CONSENT', consent.type, 1 ) # TODO additional_contents.content %]
>+                                    [% IF description %]
>+                                        [% description | $raw %]
>+                                    [% ELSIF consent.type == 'GDPR_PROCESSING' # Backward compatbility ;) %]
>                                         <p>Please read the <a target="_blank" href="[% Koha.Preference('PrivacyPolicyURL') | url %]">privacy policy</a>.</p>
>                                         <p>In order to keep you logged in, we need your consent to process personal data as specified in the EU General Data Protection Regulation of May 25, 2018. If you would not agree, we will need to <strong>remove</strong> your account within a reasonable time.</p>
>                                         <p>Do you agree with our processing of your personal data as outlined in the policy?</p>
>-                                    [% ELSE %]
>-                                        <p>Description for [% consent.type | html #TODO %]. Do you agree?</p>
>+                                    [% ELSE # Fallback only %]
>+                                        <p>Description for [% consent.type | html %]. Do you agree?</p>
>                                     [% END %]
>                                     <p>
>                                         <input type="radio" name="check_[% consent.type | html %]" value="1"> Yes<br>
>-- 
>2.30.2

Actions: View | Diff | Splinter Review

Attachments on bug 31503: 140047 | 140048 | 140049 | 140050 | 140080 | 140081 | 140082 | 140083 | 140084 | 140085 | 140087 | 140088 | 140089 | 140090 | 140666 | 140667 | 140668 | 140669 | 140670 | 140671 | 140672 | 141216 | 141217 | 141218 | 141219 | 141220 | 141221 | 141222 | 141263 | 141264 | 141265 | 141266 | 141267 | 141268 | 141269 | 141302 | 141570 | 155000 | 155001 | 155002 | 155003 | 155177 | 155178 | 155179 | 155180 | 155189 | 155190 | 155191 | 155656 | 155657 | 155658 | 155659 | 155660 | 155661 | 155691 | 155694 | 155783 | 155784 | 155785 | 155786 | 155787 | 155788 | 155789 | 155790 | 155791 | 157117 | 157118 | 157119 | 157120 | 157121 | 157122 | 157123 | 157124 | 157125 | 157126 | 157773 | 157774 | 157775 | 157776 | 157777 | 157778 | 157779 | 157780 | 157781 | 157782 | 157783