Attachment 59739 Details for Bug 13757 – Bug 13757: (QA followup) Make opac-memberentry.pl handle attrs deletion

[patch] Bug 13757: (QA followup) Make opac-memberentry.pl handle attrs deletion

Bug-13757-QA-followup-Make-opac-memberentrypl-hand.patch (text/plain), 2.42 KB, created by Tomás Cohen Arazi (tcohen) on 2017-02-01 13:09:57 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Tomás Cohen Arazi (tcohen)

Created: 2017-02-01 13:09:57 UTC

Size: 2.42 KB

patch

obsolete

>From bbf70e76edbcc2d7a8eb29228d5a74b0ccfee6e7 Mon Sep 17 00:00:00 2001
>From: Tomas Cohen Arazi <tomascohen@theke.io>
>Date: Mon, 30 Jan 2017 12:36:57 -0300
>Subject: [PATCH] Bug 13757: (QA followup) Make opac-memberentry.pl handle
> attrs deletion
>
>The original code on this bug skipped empty-valued attributes. But
>emptying attributes is the only way to tell the controller script that
>the user wants to delete them.
>
>This patch makes opac-memberentry.pl check the existence of attributes
>sharing the code of the empty for the given patron, and it stores the
>deletion on the Koha::Patron::Modification as needed. Otherwise
>deletions got skipped.
>
>To test:
>- Verify setting/deleting attributes that are opac-editable and verify
>the results are sound.
>
>https://bugs.koha-community.org/show_bug.cgi?id=13737
>---
> opac/opac-memberentry.pl | 17 ++++++++++++-----
> 1 file changed, 12 insertions(+), 5 deletions(-)
>
>diff --git a/opac/opac-memberentry.pl b/opac/opac-memberentry.pl
>index b3fed91623..4b00623c94 100755
>--- a/opac/opac-memberentry.pl
>+++ b/opac/opac-memberentry.pl
>@@ -89,7 +89,7 @@ $template->param(
>     OPACPatronDetails => C4::Context->preference('OPACPatronDetails'),
> );
> 
>-my $attributes = ParsePatronAttributes($cgi);
>+my $attributes = ParsePatronAttributes($borrowernumber,$cgi);
> my $conflicting_attribute = 0;
> 
> foreach my $attr (@$attributes) {
>@@ -560,17 +560,22 @@ sub GeneratePatronAttributesForm {
> }
> 
> sub ParsePatronAttributes {
>-    my ( $cgi ) = @_;
>+    my ($borrowernumber,$cgi) = @_;
> 
>-    my @codes = $cgi->multi_param('patron_attribute_code');
>+    my @codes  = $cgi->multi_param('patron_attribute_code');
>     my @values = $cgi->multi_param('patron_attribute_value');
> 
>     my $ea = each_array( @codes, @values );
>     my @attributes;
>     my %dups = ();
> 
>-    while ( my ( $code, $value, $password ) = $ea->() ) {
>-        next unless defined($value) and $value ne '';
>+    while ( my ( $code, $value ) = $ea->() ) {
>+        # Don't skip if the patron already has attributes with $code, because
>+        # it means we are being requested to remove the attributes.
>+        next
>+            unless defined($value) and $value ne ''
>+            or Koha::Patron::Attributes->search(
>+            { borrowernumber => $borrowernumber, code => $code } )->count > 0;
>         next if exists $dups{$code}->{$value};
>         $dups{$code}->{$value} = 1;
> 
>@@ -579,3 +584,5 @@ sub ParsePatronAttributes {
> 
>     return \@attributes;
> }
>+
>+1;
>-- 
>2.11.0

Actions: View | Diff | Splinter Review

Attachments on bug 13757: 42254 | 42626 | 42627 | 47625 | 48040 | 48041 | 48042 | 48043 | 48379 | 48380 | 48381 | 48382 | 56924 | 56925 | 56926 | 56927 | 56928 | 56929 | 57041 | 57042 | 57043 | 57044 | 57045 | 57046 | 58252 | 58253 | 58254 | 58255 | 58351 | 58352 | 58353 | 58354 | 58355 | 58356 | 58357 | 58428 | 58429 | 58581 | 58703 | 58706 | 58707 | 58708 | 58709 | 58710 | 58711 | 58712 | 58713 | 58714 | 58715 | 59376 | 59737 | 59738 | 59739 | 59813 | 59896 | 59897 | 59898 | 60359 | 60360 | 61132 | 61133 | 61134 | 61135 | 61136 | 61137 | 61138 | 61139 | 61140 | 61141 | 61142 | 61143 | 61144 | 61145 | 61146 | 61147 | 61148 | 61149 | 61150 | 61492 | 61493 | 61555 | 61556 | 61557 | 61558 | 61559 | 61560 | 61561 | 61562 | 61563 | 61564 | 61565 | 61566 | 61567 | 61568 | 61569 | 61570 | 61571 | 61572 | 61573 | 61574 | 61575