Attachment 57044 Details for Bug 13757 – Bug 13757: (QA followup) fix QA issues, add small niceties

[patch] Bug 13757: (QA followup) fix QA issues, add small niceties

Bug-13757-QA-followup-fix-QA-issues-add-small-nice.patch (text/plain), 5.57 KB, created by Tomás Cohen Arazi (tcohen) on 2016-11-01 15:30:37 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Tomás Cohen Arazi (tcohen)

Created: 2016-11-01 15:30:37 UTC

Size: 5.57 KB

patch

obsolete

>From 3af413d6a6cb34678f4aa7a3c09e99625fccf6a9 Mon Sep 17 00:00:00 2001
>From: Jesse Weaver <jweaver@bywatersolutions.com>
>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.
>
>Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
>---
> .../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 4f3af30..b855e1e 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
>@@ -137,7 +137,7 @@ $(document).ready(function() {
>           [% ELSE %]
>             <input type="checkbox" id="opac_editable" name="opac_editable" />
>           [% END %]
>-            <span>Check to allow patrons to edit this attribute from their details page in the OPAC. (Requires above.)</span>
>+            <span>Check to allow patrons to edit this attribute from their details page in the OPAC. (Requires above, does not work with <a href="/cgi-bin/koha/admin/preferences.pl?op=search&amp;searchfield=PatronSelfRegistrationVerifyByEmail" target="_blank">PatronSelfRegistrationVerifyByEmail</a>.)</span>
>        </li>
>        <li><label for="staff_searchable">Searchable: </label>
>           [% 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 @@
>                     </fieldset>
>                [% 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 %]
>                             <fieldset id="aai_[% pa_loo.class %]" class="rows patron-attributes">
>@@ -927,17 +927,17 @@
>                                             [% ELSE %]
>                                                 <textarea rows="2" cols="30" id="[% form_id %]" name="patron_attribute_value">[% pa_value.value %]</textarea>
>                                             [% END %]
>+                                            <a href="#" class="clear-attribute">Clear</a>
>+                                            [% IF ( pa.type.repeatable ) %]
>+                                            <a href="#" class="clone-attribute">New</a>
>+                                            [% END %]
>                                             [% IF ( pa.type.password_allowed ) %]
>-                                                (<label class="lradio" for="[% form_id %]_password">Password:</label>
>-                                                <input type="password" maxlength="64" value="[% pa_value.password %]" id="[% form_id %]_password" name="patron_attribute_password" />)
>+                                                </li><li><label for="[% form_id %]_password">Password:</label>
>+                                                <input type="password" maxlength="64" value="[% pa_value.password %]" id="[% form_id %]_password" name="patron_attribute_password" />
>                                             [% ELSE %]
>                                                 [%# To keep the form inputs lined up in the POST %]
>                                                 <input type="hidden" name="patron_attribute_password" value="" />
>                                             [% END %]
>-                                            <a href="#" class="clear-attribute">Clear</a>
>-                                            [% IF ( pa.type.repeatable ) %]
>-                                            <a href="#" class="clone-attribute">New</a>
>-                                            [% 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.7.4

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