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

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/member-alt-address-style.inc (+4 lines)
Lines 222-228 Link Here
222
                <label for="B_email">
222
                <label for="B_email">
223
            [% END %]
223
            [% END %]
224
            Email: </label>
224
            Email: </label>
225
            [% IF ( NoUpdateEmail ) %]
226
            <input type="text" id="B_email" name="B_email" size="45" value="[% patron.B_email | html %]" disabled="disabled"/>
227
            [% ELSE %]
225
            <input type="text" id="B_email" name="B_email" size="45" value="[% patron.B_email | html %]" />
228
            <input type="text" id="B_email" name="B_email" size="45" value="[% patron.B_email | html %]" />
229
            [% END %]
226
            [% IF ( mandatoryB_email ) %]<span class="required">Required</span>[% END %]
230
            [% IF ( mandatoryB_email ) %]<span class="required">Required</span>[% END %]
227
        </li>
231
        </li>
228
    [% END %]
232
    [% END %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt (-5 / +9 lines)
Lines 690-696 legend:hover { Link Here
690
                                                    [% END %]
690
                                                    [% END %]
691
                                                        Primary email:
691
                                                        Primary email:
692
                                                    </label>
692
                                                    </label>
693
                                                    [% IF ( NoUpdateEmail ) %]
694
                                                    <input type="text" id="email" name="email" size="45" value="[% patron.email | html %]" disabled="disabled" />
695
                                                    [% ELSE %]
693
                                                    <input type="text" id="email" name="email" size="45" value="[% patron.email | html %]" />
696
                                                    <input type="text" id="email" name="email" size="45" value="[% patron.email | html %]" />
697
                                                    [% END %]
694
                                                    [% IF ( mandatoryemail ) %]
698
                                                    [% IF ( mandatoryemail ) %]
695
                                                        <span class="required">Required</span>
699
                                                        <span class="required">Required</span>
696
                                                    [% END %]
700
                                                    [% END %]
Lines 707-719 legend:hover { Link Here
707
                                                    [% END %]
711
                                                    [% END %]
708
                                                        Secondary email:
712
                                                        Secondary email:
709
                                                    </label>
713
                                                    </label>
714
                                                    [% IF ( NoUpdateEmail ) %]
715
                                                    <input type="text" id="emailpro" name="emailpro" size="45" value="[% patron.emailpro | html %]" disabled="disabled"/>
716
                                                    [% ELSE %]
710
                                                    <input type="text" id="emailpro" name="emailpro" size="45" value="[% patron.emailpro | html %]" />
717
                                                    <input type="text" id="emailpro" name="emailpro" size="45" value="[% patron.emailpro | html %]" />
711
                                                    [% IF ( mandatoryemailpro ) %]
712
                                                        <span class="required">Required</span>
713
                                                    [% END %]
718
                                                    [% END %]
714
                                                </li>
719
                                                    [% IF ( mandatoryemailpro ) %]
715
                                            [% END # /UNLESS noemailpro %]
720
                                                        <span class="required">Required</span
716
717
                                            [% UNLESS nofax %]
721
                                            [% UNLESS nofax %]
718
                                                <li>
722
                                                <li>
719
                                                    [% IF ( mandatoryfax ) %]
723
                                                    [% IF ( mandatoryfax ) %]
(-)a/members/memberentry.pl (-2 / +9 lines)
Lines 101-106 my $step = $input->param('step') || 0; Link Here
101
my @errors;
101
my @errors;
102
my $borrower_data;
102
my $borrower_data;
103
my $NoUpdateLogin;
103
my $NoUpdateLogin;
104
my $NoUpdateEmail;
104
my $userenv = C4::Context->userenv;
105
my $userenv = C4::Context->userenv;
105
my @messages;
106
my @messages;
106
107
Lines 166-171 if ( $op eq 'modify' or $op eq 'save' or $op eq 'duplicate' ) { Link Here
166
    my $logged_in_user = Koha::Patrons->find( $loggedinuser );
167
    my $logged_in_user = Koha::Patrons->find( $loggedinuser );
167
    output_and_exit_if_error( $input, $cookie, $template, { module => 'members', logged_in_user => $logged_in_user, current_patron => $patron } );
168
    output_and_exit_if_error( $input, $cookie, $template, { module => 'members', logged_in_user => $logged_in_user, current_patron => $patron } );
168
169
170
    # check permission to modify email info.
171
    if ( $patron->is_superlibrarian && !$logged_in_user->is_superlibrarian ) {
172
        $NoUpdateEmail = 1;
173
    }
174
169
    $borrower_data = $patron->unblessed;
175
    $borrower_data = $patron->unblessed;
170
    $borrower_data->{category_type} = $patron->category->category_type;
176
    $borrower_data->{category_type} = $patron->category->category_type;
171
}
177
}
Lines 206-212 if ( $op eq 'insert' || $op eq 'modify' || $op eq 'save' || $op eq 'duplicate' ) Link Here
206
            push(@errors,"ERROR_$_");
212
            push(@errors,"ERROR_$_");
207
        }
213
        }
208
    }
214
    }
209
  # check permission to modify login info.
215
216
    # check permission to modify login info.
210
    if (ref($borrower_data) && ($borrower_data->{'category_type'} eq 'S') && ! (C4::Auth::haspermission($userenv->{'id'},{'staffaccess'=>1})) )  {
217
    if (ref($borrower_data) && ($borrower_data->{'category_type'} eq 'S') && ! (C4::Auth::haspermission($userenv->{'id'},{'staffaccess'=>1})) )  {
211
        $NoUpdateLogin = 1;
218
        $NoUpdateLogin = 1;
212
    }
219
    }
Lines 827-832 $template->param( Link Here
827
  modify          => $modify,
834
  modify          => $modify,
828
  nok     => $nok,#flag to know if an error
835
  nok     => $nok,#flag to know if an error
829
  NoUpdateLogin =>  $NoUpdateLogin,
836
  NoUpdateLogin =>  $NoUpdateLogin,
837
  NoUpdateEmail =>  $NoUpdateEmail,
830
  );
838
  );
831
839
832
# Generate CSRF token
840
# Generate CSRF token
833
- 

Return to bug 23634