Attachment 129441 Details for Bug 29843 – Bug 29843: Use in opac/opac-privacy.pl

[patch] Bug 29843: Use in opac/opac-privacy.pl

Bug-29843-Use-in-opacopac-privacypl.patch (text/plain), 4.01 KB, created by Tomás Cohen Arazi (tcohen) on 2022-01-13 19:22:12 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Tomás Cohen Arazi (tcohen)

Created: 2022-01-13 19:22:12 UTC

Size: 4.01 KB

patch

obsolete

>From 92c0aba74034b9951a7fa5ffa0f4991090eaff3a Mon Sep 17 00:00:00 2001
>From: Tomas Cohen Arazi <tomascohen@theke.io>
>Date: Mon, 10 Jan 2022 11:44:07 -0300
>Subject: [PATCH] Bug 29843: Use in opac/opac-privacy.pl
>
>This patch makes the opac/opac-privacy.pl OPAC page use the new
>anonymize method.
>
>To test:
>1. Have some checked-in materiales
>2. Have OPACPrivacy enabled
>3. Notice your checkouts history contains what you expect
>4. Go to 'your privacy'
>5. Click on 'Delete checkout history'
>=> SUCCESS: It works, no crash.
>6. Sign off :-D
>---
> opac/opac-privacy.pl | 64 +++++++++++++++++++++++++++++---------------
> 1 file changed, 42 insertions(+), 22 deletions(-)
>
>diff --git a/opac/opac-privacy.pl b/opac/opac-privacy.pl
>index 8ea6b12066..640884e437 100755
>--- a/opac/opac-privacy.pl
>+++ b/opac/opac-privacy.pl
>@@ -32,8 +32,6 @@ if ( ! C4::Context->preference('OPACPrivacy') || ! C4::Context->preference('opac
>     exit;
> }
> 
>-my $dbh   = C4::Context->dbh;
>-
> my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
>     {
>         template_name   => "opac-privacy.tt",
>@@ -47,8 +45,9 @@ my $privacy                    = $query->param("privacy");
> my $privacy_guarantor_checkouts = $query->param("privacy_guarantor_checkouts");
> my $privacy_guarantor_fines     = $query->param("privacy_guarantor_fines");
> 
>+my $patron = Koha::Patrons->find( $borrowernumber );;
>+
> if ( $op eq "update_privacy" ) {
>-    my $patron = Koha::Patrons->find( $borrowernumber );
>     if ( $patron ) {
>         $patron->set({
>             privacy                    => $privacy,
>@@ -60,30 +59,51 @@ if ( $op eq "update_privacy" ) {
> }
> elsif ( $op eq "delete_record" ) {
> 
>-    # delete all reading records for items returned
>-    my $rows = eval {
>-        Koha::Patrons->search({ 'me.borrowernumber' => $borrowernumber })->anonymise_issue_history;
>-    };
>-    $template->param(
>-        (
>-              $@    ? ( history_not_deleted => 1 )
>-            : $rows ? ( deleted             => int($rows) )
>-            :         ( nothing_to_delete => 1 )
>-        )
>-    );
>-}
>+    my $holds     = $query->param('holds');
>+    my $checkouts = $query->param('checkouts');
>+    my $all       = $query->param('all');
>+
>+    $template->param( delete_all_quested => 1 )
>+      if $all;
>+
>+    if ( $all or $checkouts ) {
>+
>+        # delete all reading records for items returned
>+        my $rows = eval { $patron->old_checkouts->anonymize + 0 };
> 
>-# get borrower privacy ....
>-my $borrower = Koha::Patrons->find( $borrowernumber );;
>+        $template->param(
>+            (
>+                  $@    ? ( error_deleting_checkouts_history => 1 )
>+                : $rows ? ( deleted_checkouts => int($rows) )
>+                :         ( no_checkouts_to_delete => 1 )
>+            ),
>+            delete_checkouts_requested => 1,
>+        );
>+    }
>+
>+    if ( $all or $holds ) {
>+
>+        my $rows = eval { $patron->old_holds->anonymize + 0 };
>+
>+        $template->param(
>+            (
>+                  $@    ? ( error_deleting_holds_history => 1 )
>+                : $rows ? ( deleted_holds => int($rows) )
>+                :         ( no_holds_to_delete => 1 )
>+            ),
>+            delete_holds_requested => 1,
>+        );
>+    }
>+}
> 
> $template->param(
>     'Ask_data'                       => 1,
>-    'privacy' . $borrower->privacy() => 1,
>+    'privacy' . $patron->privacy() => 1,
>     'privacyview'                    => 1,
>-    'borrower'                       => $borrower,
>-    'surname'                        => $borrower->surname,
>-    'firstname'                      => $borrower->firstname,
>-    'has_guarantor_flag'             => $borrower->guarantor_relationships->guarantors->_resultset->count
>+    'borrower'                       => $patron,
>+    'surname'                        => $patron->surname,
>+    'firstname'                      => $patron->firstname,
>+    'has_guarantor_flag'             => $patron->guarantor_relationships->guarantors->_resultset->count
> );
> 
> output_html_with_http_headers $query, $cookie, $template->output, undef, { force_no_caching => 1 };
>-- 
>2.32.0

Actions: View | Diff | Splinter Review

Attachments on bug 29843: 129269 | 129270 | 129271 | 129272 | 129274 | 129275 | 129276 | 129277 | 129278 | 129438 | 129439 | 129440 | 129441 | 129442 | 129445 | 129446 | 129447 | 129448 | 129449 | 129475 | 129476 | 129477 | 129478 | 129479 | 129492 | 129493 | 129494 | 129495 | 129496 | 130264 | 130265 | 130266 | 130267 | 130268 | 130335