Attachment #156512 for bug #30700

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




                            <a class="toplinks" href="/cgi-bin/koha/circ/circulation.pl?borrowernumber=[% loggedinusernumber | html %]">My checkouts</a>
                        </li>
                    [% END %]

                    [% IF Koha.Preference( 'CookieConsent' ) && JSConsents.all('staffConsent').size %]
                        <li class="toplinks-myconsents">
                            <a id="viewCookieConsents" href="#" class="toplinks">My consents</a>
                        </li>
                    [% END %]

                    <li class ="toplinks-changepassword">
                        <a class="toplinks" href="/cgi-bin/koha/members/member-password.pl?member=[% loggedinusernumber | html %]">Change password</a>
                    </li>

                    <li>
                        <a id="logout" class="toplinks" href="/cgi-bin/koha/mainpage.pl?logout.x=1">Log out</a>
                    </li>




        [% IF patron.is_adult AND Koha.Preference("borrowerRelationship") %]
            <a id="addchild" class="btn btn-default" href="/cgi-bin/koha/members/memberentry.pl?op=add&amp;guarantor_id=[% patron.borrowernumber | html %]"><i class="fa fa-plus"></i> Add guarantee</a>
        [% END %]
        <a id="changepassword" class="btn btn-default" href="/cgi-bin/koha/members/member-password.pl?member=[% patron.borrowernumber | html %]"><i class="fa fa-lock"></i> Change password</a>
        <a id="duplicate" class="btn btn-default" href="/cgi-bin/koha/members/memberentry.pl?op=duplicate&amp;borrowernumber=[% patron.borrowernumber | html %]"><i class="fa fa-copy"></i> Duplicate</a>
    [% END %]
    [% IF CAN_user_borrowers_edit_borrowers || patron.borrowernumber == logged_in_user.borrowernumber %]
        <a id="changepassword" class="btn btn-default" href="/cgi-bin/koha/members/member-password.pl?member=[% patron.borrowernumber | html %]"><i class="fa fa-lock"></i> Change password</a>
    [% END %]

    [% IF CAN_user_circulate_circulate_remaining_permissions %]
    <div class="btn-group">




        template_name   => "members/member-password.tt",
        query           => $input,
        type            => "intranet",
        flagsrequired   => { catalogue => 1 },
    }
);

my $patron_id    = $input->param('member');
my $logged_in_user = Koha::Patrons->find( $loggedinuser );

if ( !$logged_in_user->has_permission({ borrowers => 'edit_borrowers' }) and $loggedinuser != $patron_id ) {
    print $input->redirect("/cgi-bin/koha/errors/404.pl");

} else {
# patron has permission to edit other borrowers, or is changing their own password

my $destination  = $input->param('destination');
my $newpassword  = $input->param('newpassword');
my $newpassword2 = $input->param('newpassword2');


my @errors;

my $logged_in_user = Koha::Patrons->find( $loggedinuser );
my $patron = Koha::Patrons->find( $patron_id );
output_and_exit_if_error( $input, $cookie, $template, { module => 'members', logged_in_user => $logged_in_user, current_patron => $patron } );


        $patron->userid($new_user_id)->store
            if $new_user_id and $new_user_id ne $patron->userid;
        $template->param( newpassword => $newpassword );
        if ( !$patron->has_permission({ borrowers => 'edit_borrowers' }) ) {
            print $input->redirect("/cgi-bin/koha/mainpage.pl");
        }
        elsif ( $destination eq 'circ' ) {
            print $input->redirect("/cgi-bin/koha/circ/circulation.pl?findborrower=" . $patron->cardnumber);
        }
        else {

    }
}

} # patron has permission to edit other borrowers, or is changing their own password

output_html_with_http_headers $input, $cookie, $template->output;
- 

Return to bug 30700

Lines 203-213 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/header.inc (+6 lines)
203	<a class="toplinks" href="/cgi-bin/koha/circ/circulation.pl?borrowernumber=[% loggedinusernumber \| html %]">My checkouts</a>	203	<a class="toplinks" href="/cgi-bin/koha/circ/circulation.pl?borrowernumber=[% loggedinusernumber \| html %]">My checkouts</a>
204	</li>	204	</li>
205	[% END %]	205	[% END %]
		206
206	[% IF Koha.Preference( 'CookieConsent' ) && JSConsents.all('staffConsent').size %]	207	[% IF Koha.Preference( 'CookieConsent' ) && JSConsents.all('staffConsent').size %]
207	<li class="toplinks-myconsents">	208	<li class="toplinks-myconsents">
208	<a id="viewCookieConsents" href="#" class="toplinks">My consents</a>	209	<a id="viewCookieConsents" href="#" class="toplinks">My consents</a>
209	</li>	210	</li>
210	[% END %]	211	[% END %]
		212
		213	<li class ="toplinks-changepassword">
		214	<a class="toplinks" href="/cgi-bin/koha/members/member-password.pl?member=[% loggedinusernumber \| html %]">Change password</a>
		215	</li>
		216
211	<li>	217	<li>
212	<a id="logout" class="toplinks" href="/cgi-bin/koha/mainpage.pl?logout.x=1">Log out</a>	218	<a id="logout" class="toplinks" href="/cgi-bin/koha/mainpage.pl?logout.x=1">Log out</a>
213	</li>	219	</li>

Lines 13-21 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/members-toolbar.inc (-1 / +3 lines)
13	[% IF patron.is_adult AND Koha.Preference("borrowerRelationship") %]	13	[% IF patron.is_adult AND Koha.Preference("borrowerRelationship") %]
14	<a id="addchild" class="btn btn-default" href="/cgi-bin/koha/members/memberentry.pl?op=add&guarantor_id=[% patron.borrowernumber \| html %]"><i class="fa fa-plus"></i> Add guarantee</a>	14	<a id="addchild" class="btn btn-default" href="/cgi-bin/koha/members/memberentry.pl?op=add&guarantor_id=[% patron.borrowernumber \| html %]"><i class="fa fa-plus"></i> Add guarantee</a>
15	[% END %]	15	[% END %]
16	<a id="changepassword" class="btn btn-default" href="/cgi-bin/koha/members/member-password.pl?member=[% patron.borrowernumber \| html %]"><i class="fa fa-lock"></i> Change password</a>
17	<a id="duplicate" class="btn btn-default" href="/cgi-bin/koha/members/memberentry.pl?op=duplicate&borrowernumber=[% patron.borrowernumber \| html %]"><i class="fa fa-copy"></i> Duplicate</a>	16	<a id="duplicate" class="btn btn-default" href="/cgi-bin/koha/members/memberentry.pl?op=duplicate&borrowernumber=[% patron.borrowernumber \| html %]"><i class="fa fa-copy"></i> Duplicate</a>
18	[% END %]	17	[% END %]
		18	[% IF CAN_user_borrowers_edit_borrowers \|\| patron.borrowernumber == logged_in_user.borrowernumber %]
		19	<a id="changepassword" class="btn btn-default" href="/cgi-bin/koha/members/member-password.pl?member=[% patron.borrowernumber \| html %]"><i class="fa fa-lock"></i> Change password</a>
		20	[% END %]
19		21
20	[% IF CAN_user_circulate_circulate_remaining_permissions %]	22	[% IF CAN_user_circulate_circulate_remaining_permissions %]
21	<div class="btn-group">	23	<div class="btn-group">

Lines 28-38 my ( $template, $loggedinuser, $cookie, $staffflags ) = get_template_and_user( Link Here

(-)a/members/member-password.pl (-4 / +15 lines)
28	template_name => "members/member-password.tt",	28	template_name => "members/member-password.tt",
29	query => $input,	29	query => $input,
30	type => "intranet",	30	type => "intranet",
31	flagsrequired => { borrowers => 'edit_borrowers' },	31	flagsrequired => { catalogue => 1 },
32	}	32	}
33	);	33	);
34		34
35	my $patron_id = $input->param('member');	35	my $patron_id = $input->param('member');
		36	my $logged_in_user = Koha::Patrons->find( $loggedinuser );
		37
		38	if ( !$logged_in_user->has_permission({ borrowers => 'edit_borrowers' }) and $loggedinuser != $patron_id ) {
		39	print $input->redirect("/cgi-bin/koha/errors/404.pl");
		40
		41	} else {
		42	# patron has permission to edit other borrowers, or is changing their own password
		43
36	my $destination = $input->param('destination');	44	my $destination = $input->param('destination');
37	my $newpassword = $input->param('newpassword');	45	my $newpassword = $input->param('newpassword');
38	my $newpassword2 = $input->param('newpassword2');	46	my $newpassword2 = $input->param('newpassword2');
Lines 40-46 my $new_user_id = $input->param('newuserid'); Link Here
40		48
41	my @errors;	49	my @errors;
42		50
43	my $logged_in_user = Koha::Patrons->find( $loggedinuser );
44	my $patron = Koha::Patrons->find( $patron_id );	51	my $patron = Koha::Patrons->find( $patron_id );
45	output_and_exit_if_error( $input, $cookie, $template, { module => 'members', logged_in_user => $logged_in_user, current_patron => $patron } );	52	output_and_exit_if_error( $input, $cookie, $template, { module => 'members', logged_in_user => $logged_in_user, current_patron => $patron } );
46		53
Lines 68-74 if ( $newpassword and not @errors) { Link Here
68	$patron->userid($new_user_id)->store	75	$patron->userid($new_user_id)->store
69	if $new_user_id and $new_user_id ne $patron->userid;	76	if $new_user_id and $new_user_id ne $patron->userid;
70	$template->param( newpassword => $newpassword );	77	$template->param( newpassword => $newpassword );
71	if ( $destination eq 'circ' ) {	78	if ( !$patron->has_permission({ borrowers => 'edit_borrowers' }) ) {
		79	print $input->redirect("/cgi-bin/koha/mainpage.pl");
		80	}
		81	elsif ( $destination eq 'circ' ) {
72	print $input->redirect("/cgi-bin/koha/circ/circulation.pl?findborrower=" . $patron->cardnumber);	82	print $input->redirect("/cgi-bin/koha/circ/circulation.pl?findborrower=" . $patron->cardnumber);
73	}	83	}
74	else {	84	else {
Lines 107-110 if ( scalar(@errors) ) { Link Here
107	}	117	}
108	}	118	}
109		119
		120	} # patron has permission to edit other borrowers, or is changing their own password
		121
110	output_html_with_http_headers $input, $cookie, $template->output;	122	output_html_with_http_headers $input, $cookie, $template->output;
111	-