gitea
/
Koha-clms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bug 6782 [QA Followup] - Remove unused param and limit calls to Koha.Preference 

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
This commit is contained in:
Kyle M Hall 2016-12-30 18:42:37 +00:00
parent 141d29358f
commit 6caac44a94
2 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt
View File

@ -596,35 +596,36 @@ $(document).ready(function() {
[% END %]
[% IF ( step_3 ) %]
[% SET autoMemberNum = Koha.Preference('autoMemberNum') %]
<fieldset class="rows" id="memberentry_library_management">
<legend id="library_management_lgd">Library management</legend><ol>
[% UNLESS nocardnumber %]
<li>
[% IF mandatorycardnumber and not Koha.Preference('autoMemberNum') %]
[% IF mandatorycardnumber and not autoMemberNum %]
<label for="cardnumber" class="required">
[% ELSE %]
<label for="cardnumber" class="validated">
[% END %]
[% IF Koha.Preference('autoMemberNum') %]
[% IF autoMemberNum %]
Card number<br>(<u>leave blank for auto calc during registration</u>): </label>
[% ELSE %]
Card number: </label>
[% END %]
[% IF minlength_cardnumber == maxlength_cardnumber %]
<input type="text" id="cardnumber" name="cardnumber" size="20" value="[% cardnumber | html %]" minlength="[% minlength_cardnumber %]" maxlength="[% maxlength_cardnumber %]" />
[% IF mandatorycardnumber and not Koha.Preference('autoMemberNum') %]<span class="required">Required</span>[% END %]
[% IF mandatorycardnumber and not autoMemberNum %]<span class="required">Required</span>[% END %]
<div class="hint">Card number must be exactly [% minlength_cardnumber %] characters.</div>
[% ELSIF minlength_cardnumber && maxlength_cardnumber %]
<input type="text" id="cardnumber" name="cardnumber" size="20" value="[% cardnumber | html %]" minlength="[% minlength_cardnumber %]" maxlength="[% maxlength_cardnumber %]" />
[% IF mandatorycardnumber and not Koha.Preference('autoMemberNum') %]<span class="required">Required</span>[% END %]
[% IF mandatorycardnumber and not autoMemberNum %]<span class="required">Required</span>[% END %]
<div class="hint">Card number must be between [% minlength_cardnumber %] and [% maxlength_cardnumber %] characters.</div>
[% ELSIF maxlength_cardnumber %]
<input type="text" id="cardnumber" name="cardnumber" size="20" value="[% cardnumber | html %]" maxlength="[% maxlength_cardnumber %]" />
[% IF mandatorycardnumber and not Koha.Preference('autoMemberNum') %]<span class="required">Required</span>[% END %]
[% IF mandatorycardnumber and not autoMemberNum %]<span class="required">Required</span>[% END %]
<div class="hint">Card number can be up to [% maxlength_cardnumber %] characters.</div>
[% ELSE %]
<input type="text" id="cardnumber" name="cardnumber" size="20" value="[% cardnumber | html %]" />
[% IF mandatorycardnumber and not Koha.Preference('autoMemberNum') %]<span class="required">Required</span>[% END %]
[% IF mandatorycardnumber and not autoMemberNum %]<span class="required">Required</span>[% END %]
<div class="hint">There is no minimum or maximum character length.</div>
[% END %]
</li>

6
members/memberentry.pl
View File

@ -561,12 +561,6 @@ if ( $op eq "duplicate" ) {
$data{'cardnumber'} = "";
}
if (C4::Context->preference("autoMemberNum")) {
$template->param( autoMemberNum => 1);
} else {
$template->param( autoMemberNum => 0);
}
if(!defined($data{'sex'})){
$template->param( none => 1);
} elsif($data{'sex'} eq 'F'){