From 4cfd59d11ef97e6c2fac83a623dc5e1121280d97 Mon Sep 17 00:00:00 2001 From: Marcel de Rooy Date: Thu, 1 Sep 2022 14:13:55 +0000 Subject: [PATCH] Bug 31503: Make opac-patron-consent more generic Content-Type: text/plain; charset=utf-8 We now allow multiple consent types as defined under AV (read: authorised values) category 'PATRON_CONSENT'. The description is used on the form too. This is the base patch for multiple consents. We can do some more polishing on a follow-up or another report even. In order to simplify the alert for GDPR was moved to the description text. Note that we could move this also to a AC HTML block at some point. Test plan: First check the form without PATRON_CONSENT category defined. Add AV category PATRON_CONSENT. Add GDPR_PROCESSING and another one (e.g. NEWSLETTER). Verify that you can toggle consent/dissent and that everything is saved correctly. Note only a real change updates the timestamp. Signed-off-by: Marcel de Rooy --- .../en/modules/opac-patron-consent.tt | 72 +++++++++---------- opac/opac-patron-consent.pl | 34 ++++++--- 2 files changed, 57 insertions(+), 49 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 d00146e7ff..512a0a8078 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 @@ -35,30 +35,30 @@
- - [% IF Koha.Preference('GDPR_Policy') %] -
-

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.

-

Please save your consent below or log out. Thank you!

-
- [% END %] -

Your consents

- [% IF Koha.Preference('GDPR_Policy') %] -

GDPR consents

- - + + + [% FOREACH consent IN consents %] +

Consent for [% consent.type | html %]

  • -

    I have read the privacy policy and agree with your processing of my personal data as outlined therein.

    -

    Yes, I agree.
    - No, I do not agree. Please remove my account within a reasonable time.

    - [% IF gdpr_proc_consent.given_on %] - - [% ELSIF gdpr_proc_consent.refused_on %] - + [% IF consent.type == 'GDPR_PROCESSING' %] +

    Please read the privacy policy.

    +

    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 remove your account within a reasonable time.

    +

    Do you agree with our processing of your personal data as outlined in the policy?

    + [% ELSE %] +

    Description for [% consent.type | html #TODO %]. Do you agree?

    + [% END %] +

    + Yes
    + No +

    + [% IF consent.given_on %] + + [% ELSIF consent.refused_on %] +

    We registered that you did not consent on [% consent.refused_on | html %].

    [% END %]
@@ -78,33 +78,29 @@ [% INCLUDE 'opac-bottom.inc' %] [% BLOCK jsinclude %]