Bug 15343 [QA Follow up] Fix captcha display

Make captcha visible even if password field is hidden
Remove password confirmation field before submitting modification

Signed-off-by: Jesse Weaver <jweaver@bywatersolutions.com>
Signed-off-by: Mirko Tietgen <mirko@abunchofthings.net>
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Signed-off-by: Brendan Gallagher brendan@bywatersolutions.com

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 a57ab0c..7ef1f5b 100644 (file)
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-memberentry.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-memberentry.tt
@@ -814,7 +814,9 @@
                             </ol>
                         [% END %]
                     </fieldset>
+               [% END %]
 
+               [% UNLESS action == 'edit' %]
                     <fieldset class="rows" id="memberentry_captcha">
                         <ol>
 

diff --git a/opac/opac-memberentry.pl b/opac/opac-memberentry.pl
index a453f75..03ae18e 100755 (executable)
--- a/opac/opac-memberentry.pl
+++ b/opac/opac-memberentry.pl
@@ -80,6 +80,7 @@ if ( $action eq 'create' ) {
 
     my @empty_mandatory_fields = CheckMandatoryFields( \%borrower, $action );
     my $invalidformfields = CheckForInvalidFields(\%borrower);
+    delete $borrower{'password2'};
 
     if (@empty_mandatory_fields || @$invalidformfields) {
         $template->param(