From 37f464e1cf716db97b5b07b5b82811f0d5f64e63 Mon Sep 17 00:00:00 2001
From: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Date: Tue, 17 Jul 2018 11:13:09 -0300
Subject: [PATCH] Bug 20443: Remove opac_display and opac_editable from
 Patron::Attribute

Same as previously for methods that have been added by bug 17792.
It's better to be explicite and tell we are fetch the related attribute's type

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
---
 Koha/Patron/Attribute.pm                | 28 ---------
 opac/opac-memberentry.pl                |  8 +--
 t/db_dependent/Koha/Patron/Attributes.t | 78 -------------------------
 3 files changed, 4 insertions(+), 110 deletions(-)

diff --git a/Koha/Patron/Attribute.pm b/Koha/Patron/Attribute.pm
index 03bfd91550..0a44cbf49b 100644
--- a/Koha/Patron/Attribute.pm
+++ b/Koha/Patron/Attribute.pm
@@ -52,34 +52,6 @@ sub store {
     return $self->SUPER::store();
 }
 
-=head3 opac_display
-
-    my $attribute = Koha::Patron::Attribute->new({ code => 'a_code', ... });
-    if ( $attribute->opac_display ) { ... }
-
-=cut
-
-sub opac_display {
-
-    my $self = shift;
-
-    return Koha::Patron::Attribute::Types->find( $self->code )->opac_display;
-}
-
-=head3 opac_editable
-
-    my $attribute = Koha::Patron::Attribute->new({ code => 'a_code', ... });
-    if ( $attribute->is_opac_editable ) { ... }
-
-=cut
-
-sub opac_editable {
-
-    my $self = shift;
-
-    return Koha::Patron::Attribute::Types->find( $self->code )->opac_editable;
-}
-
 =head3 type
 
     my $attribute_type = $attribute->type;
diff --git a/opac/opac-memberentry.pl b/opac/opac-memberentry.pl
index 48054f3ca2..8985c5e18e 100755
--- a/opac/opac-memberentry.pl
+++ b/opac/opac-memberentry.pl
@@ -519,7 +519,7 @@ sub DelEmptyFields {
 sub FilterUnchangedAttributes {
     my ( $borrowernumber, $entered_attributes ) = @_;
 
-    my @patron_attributes = grep {$_->opac_editable} Koha::Patron::Attributes->search({ borrowernumber => $borrowernumber })->as_list;
+    my @patron_attributes = grep {$_->type->opac_editable ? $_ : ()} Koha::Patron::Attributes->search({ borrowernumber => $borrowernumber })->as_list;
 
     my $patron_attribute_types;
     foreach my $attr (@patron_attributes) {
@@ -582,7 +582,7 @@ sub GeneratePatronAttributesForm {
         return [];
     }
 
-    my @displayable_attributes = grep { $_->opac_display }
+    my @displayable_attributes = grep { $_->type->opac_display ? $_ : () }
         Koha::Patron::Attributes->search({ borrowernumber => $borrowernumber })->as_list;
 
     my %attr_values = ();
@@ -595,14 +595,14 @@ sub GeneratePatronAttributesForm {
         }
     }
     elsif ( defined $borrowernumber ) {
-        my @editable_attributes = grep { $_->opac_editable } @displayable_attributes;
+        my @editable_attributes = grep { $_->type->opac_editable ? $_ : () } @displayable_attributes;
         foreach my $attr (@editable_attributes) {
             push @{ $attr_values{ $attr->code } }, $attr->attribute;
         }
     }
 
     # Add the non-editable attributes (that don't come from the form)
-    foreach my $attr ( grep { !$_->opac_editable } @displayable_attributes ) {
+    foreach my $attr ( grep { !$_->type->opac_editable } @displayable_attributes ) {
         push @{ $attr_values{ $attr->code } }, $attr->attribute;
     }
 
diff --git a/t/db_dependent/Koha/Patron/Attributes.t b/t/db_dependent/Koha/Patron/Attributes.t
index fbe1190e62..e403e0d30e 100644
--- a/t/db_dependent/Koha/Patron/Attributes.t
+++ b/t/db_dependent/Koha/Patron/Attributes.t
@@ -157,84 +157,6 @@ subtest 'store() unique_id attributes tests' => sub {
     $schema->storage->txn_rollback;
 };
 
-subtest 'opac_display() tests' => sub {
-
-    plan tests => 2;
-
-    $schema->storage->txn_begin;
-
-    my $patron
-        = $builder->build( { source => 'Borrower' } )->{borrowernumber};
-    my $attribute_type_1 = $builder->build(
-        {   source => 'BorrowerAttributeType',
-            value  => { opac_display => 1 }
-        }
-    );
-
-    my $attribute_1 = Koha::Patron::Attribute->new(
-        {   borrowernumber => $patron,
-            code           => $attribute_type_1->{code},
-            attribute      => $patron
-        }
-    );
-    is( $attribute_1->opac_display, 1, '->opac_display returns 1' );
-
-    my $attribute_type_2 = $builder->build(
-        {   source => 'BorrowerAttributeType',
-            value  => { opac_display => 0 }
-        }
-    );
-
-    my $attribute_2 = Koha::Patron::Attribute->new(
-        {   borrowernumber => $patron,
-            code           => $attribute_type_2->{code},
-            attribute      => $patron
-        }
-    );
-    is( $attribute_2->opac_display, 0, '->opac_display returns 0' );
-
-    $schema->storage->txn_rollback;
-};
-
-subtest 'opac_editable() tests' => sub {
-
-    plan tests => 2;
-
-    $schema->storage->txn_begin;
-
-    my $patron
-        = $builder->build( { source => 'Borrower' } )->{borrowernumber};
-    my $attribute_type_1 = $builder->build(
-        {   source => 'BorrowerAttributeType',
-            value  => { opac_editable => 1 }
-        }
-    );
-
-    my $attribute_1 = Koha::Patron::Attribute->new(
-        {   borrowernumber => $patron,
-            code           => $attribute_type_1->{code},
-            attribute      => $patron
-        }
-    );
-    is( $attribute_1->opac_editable, 1, '->opac_editable returns 1' );
-
-    my $attribute_type_2 = $builder->build(
-        {   source => 'BorrowerAttributeType',
-            value  => { opac_editable => 0 }
-        }
-    );
-
-    my $attribute_2 = Koha::Patron::Attribute->new(
-        {   borrowernumber => $patron,
-            code           => $attribute_type_2->{code},
-            attribute      => $patron
-        }
-    );
-    is( $attribute_2->opac_editable, 0, '->opac_editable returns 0' );
-
-    $schema->storage->txn_rollback;
-};
-
 subtest 'type() tests' => sub {
 
     plan tests => 4;
-- 
2.39.5