Attachment #130750 for bug #30120

View | Details | Raw Unified | Return to bug 30120
Collapse All | Expand All

Lines 165-171 Patron attribute types &rsaquo; Administration &rsaquo; Koha Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/patron-attr-types.tt (-1 / +1 lines)
165	[% ELSE %]	165	[% ELSE %]
166	<input type="checkbox" id="opac_editable" name="opac_editable" />	166	<input type="checkbox" id="opac_editable" name="opac_editable" />
167	[% END %]	167	[% END %]
168	<span class="hint">Check to allow patrons to edit this attribute from their details page in the OPAC. (Requires above, does not work during <a href="/cgi-bin/koha/admin/preferences.pl?op=search&searchfield=PatronSelfRegistration" target="_blank">self-registration</a> if <a href="/cgi-bin/koha/admin/preferences.pl?op=search&searchfield=PatronSelfRegistrationVerifyByEmail" target="_blank">PatronSelfRegistrationVerifyByEmail</a> is set.)</span>	168	<span class="hint">Check to allow patrons to edit this attribute from their details page in the OPAC. (Requires above)</span>
169	</li>	169	</li>
170	<li><label for="staff_searchable">Searchable: </label>	170	<li><label for="staff_searchable">Searchable: </label>
171	[% IF attribute_type AND attribute_type.staff_searchable %]	171	[% IF attribute_type AND attribute_type.staff_searchable %]

Lines 883-889 Link Here

(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-memberentry.tt (-1 / +1 lines)
883	</div> <!-- /.row -->	883	</div> <!-- /.row -->
884	[% END %]	884	[% END %]
885		885
886	[% IF ( Koha.Preference('ExtendedPatronAttributes') && patron_attribute_classes.size && ! ( action == 'new' && Koha.Preference('PatronSelfRegistrationVerifyByEmail') ) ) %]	886	[% IF ( Koha.Preference('ExtendedPatronAttributes') && patron_attribute_classes.size ) %]
887	<div class="row">	887	<div class="row">
888	<div class="col">	888	<div class="col">
889	[% FOREACH pa_class IN patron_attribute_classes %]	889	[% FOREACH pa_class IN patron_attribute_classes %]

Lines 189-194 if ( $action eq 'create' ) { Link Here

(-)a/opac/opac-memberentry.pl (+1 lines)
189	$borrower{password} = Koha::AuthUtils::generate_password(Koha::Patron::Categories->find($borrower{categorycode})) unless $borrower{password};	189	$borrower{password} = Koha::AuthUtils::generate_password(Koha::Patron::Categories->find($borrower{categorycode})) unless $borrower{password};
190	$borrower{verification_token} = $verification_token;	190	$borrower{verification_token} = $verification_token;
191		191
		192	$borrower{extended_attributes} = to_json($attributes);
192	Koha::Patron::Modification->new( \%borrower )->store();	193	Koha::Patron::Modification->new( \%borrower )->store();
193		194
194	#Send verification email	195	#Send verification email




    delete $patron_attrs->{timestamp};
    delete $patron_attrs->{verification_token};
    delete $patron_attrs->{changed_fields};
    delete $patron_attrs->{extended_attributes};
    my $patron = Koha::Patron->new( $patron_attrs )->store;

    Koha::Patron::Consent->new({ borrowernumber => $patron->borrowernumber, type => 'GDPR_PROCESSING', given_on => $consent_dt })->store if $consent_dt;

    if ($patron) {
        if( $m->extended_attributes ){
            $m->borrowernumber( $patron->borrowernumber);
            $m->changed_fields(['extended_attributes']);
            $m->approve();
        } else {
            $m->delete();
        }
        C4::Form::MessagingPreferences::handle_form_action($cgi, { borrowernumber => $patron->borrowernumber }, $template, 1, C4::Context->preference('PatronSelfRegistrationDefaultCategory') ) if C4::Context->preference('EnhancedMessagingPreferences');

        $template->param( password_cleartext => $patron->plain_text_password );
- 

Return to bug 30120

Lines 66-77 if ( Link Here

(-)a/opac/opac-registration-verify.pl (-2 / +8 lines)
66	delete $patron_attrs->{timestamp};	66	delete $patron_attrs->{timestamp};
67	delete $patron_attrs->{verification_token};	67	delete $patron_attrs->{verification_token};
68	delete $patron_attrs->{changed_fields};	68	delete $patron_attrs->{changed_fields};
		69	delete $patron_attrs->{extended_attributes};
69	my $patron = Koha::Patron->new( $patron_attrs )->store;	70	my $patron = Koha::Patron->new( $patron_attrs )->store;
70		71
71	Koha::Patron::Consent->new({ borrowernumber => $patron->borrowernumber, type => 'GDPR_PROCESSING', given_on => $consent_dt })->store if $consent_dt;	72	Koha::Patron::Consent->new({ borrowernumber => $patron->borrowernumber, type => 'GDPR_PROCESSING', given_on => $consent_dt })->store if $consent_dt;
72		73
73	if ($patron) {	74	if ($patron) {
74	$m->delete();	75	if( $m->extended_attributes ){
		76	$m->borrowernumber( $patron->borrowernumber);
		77	$m->changed_fields(['extended_attributes']);
		78	$m->approve();
		79	} else {
		80	$m->delete();
		81	}
75	C4::Form::MessagingPreferences::handle_form_action($cgi, { borrowernumber => $patron->borrowernumber }, $template, 1, C4::Context->preference('PatronSelfRegistrationDefaultCategory') ) if C4::Context->preference('EnhancedMessagingPreferences');	82	C4::Form::MessagingPreferences::handle_form_action($cgi, { borrowernumber => $patron->borrowernumber }, $template, 1, C4::Context->preference('PatronSelfRegistrationDefaultCategory') ) if C4::Context->preference('EnhancedMessagingPreferences');
76		83
77	$template->param( password_cleartext => $patron->plain_text_password );	84	$template->param( password_cleartext => $patron->plain_text_password );
78	-