From ff371904e164238e36b0f705b785171d7abbd84b Mon Sep 17 00:00:00 2001 From: Jesse Weaver Date: Thu, 25 Feb 2016 15:26:31 -0700 Subject: [PATCH] Bug 13757: (QA followup) fix QA issues, add small niceties Remove debug warns, and hide patron attributes in the OPAC if PatronSelfRegistrationVerifyByEmail is enabled (as this enhancement currently does not work with Koha::Borrower::Modifications). Also, slightly improve appearance of attributes with passwords. --- .../prog/en/modules/admin/patron-attr-types.tt | 2 +- .../opac-tmpl/bootstrap/en/modules/opac-memberentry.tt | 14 +++++++------- opac/opac-memberentry.pl | 4 ---- 3 files changed, 8 insertions(+), 12 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/patron-attr-types.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/patron-attr-types.tt index 7fcd89a..6999105 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/patron-attr-types.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/patron-attr-types.tt @@ -136,7 +136,7 @@ $(document).ready(function() { [% ELSE %] [% END %] - Check to allow patrons to edit this attribute from their details page in the OPAC. (Requires above.) + Check to allow patrons to edit this attribute from their details page in the OPAC. (Requires above, does not work with PatronSelfRegistrationVerifyByEmail.)
  • [% IF ( staff_searchable_checked ) %] diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-memberentry.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-memberentry.tt index b3639a0..422e1a8 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-memberentry.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-memberentry.tt @@ -890,7 +890,7 @@ [% END %] - [% IF ( Koha.Preference('ExtendedPatronAttributes') && patron_attribute_classes.size ) %] + [% IF ( Koha.Preference('ExtendedPatronAttributes') && patron_attribute_classes.size && !Koha.Preference('PatronSelfRegistrationVerifyByEmail') ) %] [% FOREACH pa_class IN patron_attribute_classes %] [% IF pa_class.class %]
    @@ -927,17 +927,17 @@ [% ELSE %] [% END %] + Clear + [% IF ( pa.type.repeatable ) %] + New + [% END %] [% IF ( pa.type.password_allowed ) %] - ( - ) +
  • + [% ELSE %] [%# To keep the form inputs lined up in the POST %] [% END %] - Clear - [% IF ( pa.type.repeatable ) %] - New - [% END %] [% ELSE %] [% IF ( pa.type.authorised_value_category ) %] [% AuthorisedValues.GetByCode( pa.type.authorised_value, pa_value.value, 1 ) %] diff --git a/opac/opac-memberentry.pl b/opac/opac-memberentry.pl index f116d5d..7962b38 100755 --- a/opac/opac-memberentry.pl +++ b/opac/opac-memberentry.pl @@ -464,8 +464,6 @@ sub DelEmptyFields { sub GeneratePatronAttributesForm { my ( $borrower, $entered_attributes ) = @_; - use Data::Dumper; warn Dumper( $entered_attributes ); - # Get all attribute types and the values for this patron (if applicable) my @types = C4::Members::AttributeTypes::GetAttributeTypes(); @@ -510,8 +508,6 @@ sub GeneratePatronAttributesForm { }; } - use Data::Dumper; warn Dumper( \%items_by_class ); - # Finally, build a list of containing classes my @class_loop; foreach my $class (@classes) { -- 2.10.1