Fridolin Somers
3ebfc94a57
There are several more instances of the incorrect variable "streetype" in member-main-address-style.inc. Must be corrected with DB column name "streettype" in order to be able to set this field as mandatory. See also : Bug 25839 - Typo patron.streetype in member-main-address-style.inc Test plan : 1) Add "streettype" in system preference "BorrowerMandatoryField" 2) Create a new patron 3) Without patch "Street type" field is not mandatory/required, with patch it is 4) Remove "streettype" from system preference "BorrowerMandatoryField" 5) Create a new patron 6) Check "Street type" field is not mandatory/required 7) Select a value and save 8) Edit again patron 9) Check value is selected Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org> Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
190 lines
7.2 KiB
HTML
190 lines
7.2 KiB
HTML
[% USE Koha %]
|
|
[% BLOCK 'main-address-style' %]
|
|
<fieldset class="rows" id="memberentry_mainaddress">
|
|
<legend id="main_address_lgd">Main address</legend>
|
|
<ol>
|
|
[% IF Koha.Preference( 'AddressFormat' ) %]
|
|
[% PROCESS "member-main-address-style-${ Koha.Preference( 'AddressFormat' ) }" %]
|
|
[% ELSE %]
|
|
[% PROCESS 'member-main-address-style-us' %]
|
|
[% END %]
|
|
</ol>
|
|
</fieldset>
|
|
[% END %]
|
|
|
|
[% BLOCK 'member-main-address-style-us' %]
|
|
[% PROCESS 'address-style_streetnumber' %]
|
|
[% PROCESS 'address-style_roadtypes' %]
|
|
[% PROCESS 'address-style_address' %]
|
|
[% PROCESS 'address-style_address2' %]
|
|
[% PROCESS 'address-style_city' %]
|
|
[% PROCESS 'address-style_state' %]
|
|
[% PROCESS 'address-style_zipcode' %]
|
|
[% PROCESS 'address-style_country' %]
|
|
[% END %]
|
|
|
|
[% BLOCK 'member-main-address-style-de' %]
|
|
[% PROCESS 'address-style_roadtypes' %]
|
|
[% PROCESS 'address-style_address' %]
|
|
[% PROCESS 'address-style_streetnumber' %]
|
|
[% PROCESS 'address-style_address2' %]
|
|
[% PROCESS 'address-style_zipcode' %]
|
|
[% PROCESS 'address-style_city' %]
|
|
[% PROCESS 'address-style_state' %]
|
|
[% PROCESS 'address-style_country' %]
|
|
[% END %]
|
|
|
|
[% BLOCK 'member-main-address-style-fr' %]
|
|
[% PROCESS 'address-style_streetnumber' %]
|
|
[% PROCESS 'address-style_roadtypes' %]
|
|
[% PROCESS 'address-style_address' %]
|
|
[% PROCESS 'address-style_address2' %]
|
|
[% PROCESS 'address-style_zipcode' %]
|
|
[% PROCESS 'address-style_city' %]
|
|
[% PROCESS 'address-style_state' %]
|
|
[% PROCESS 'address-style_country' %]
|
|
[% END %]
|
|
|
|
[% BLOCK 'address-style_roadtypes' %]
|
|
[% IF roadtypes %]
|
|
<li>
|
|
[% IF ( mandatorystreettype ) %]
|
|
<label for="streettype" class="required">
|
|
[% ELSE %]
|
|
<label for="streettype">
|
|
[% END %]
|
|
Street type: </label>
|
|
<select name="streettype">
|
|
<option value=""></option>
|
|
[% FOR roadtype IN roadtypes %]
|
|
[% IF roadtype.authorised_value == patron.streettype %]
|
|
<option value="[% roadtype.authorised_value | html %]" selected="selected">[% roadtype.lib | html %]</option>
|
|
[% ELSE %]
|
|
<option value="[% roadtype.authorised_value | html %]">[% roadtype.lib | html %]</option>
|
|
[% END %]
|
|
[% END %]
|
|
</select>
|
|
[% IF ( mandatorystreettype ) %]<span class="required">Required</span>[% END %]
|
|
</li>
|
|
[% END %]
|
|
[% END %]
|
|
|
|
[% BLOCK 'address-style_address' %]
|
|
[% UNLESS noaddress %]
|
|
<li>
|
|
[% IF ( mandatoryaddress ) %]
|
|
<label for="address" class="required">
|
|
[% ELSE %]
|
|
<label for="address">
|
|
[% END %]
|
|
Address: </label>
|
|
<input type="text" id="address" name="address" size="40" value="[% patron.address | html %]" />
|
|
[% IF ( mandatoryaddress ) %]<span class="required">Required</span>[% END %]
|
|
</li>
|
|
[% END %]
|
|
[% END %]
|
|
|
|
[% BLOCK 'address-style_streetnumber' %]
|
|
[% UNLESS nostreetnumber %]
|
|
<li>
|
|
[% IF ( mandatorystreetnumber ) %]
|
|
<label for="streetnumber" class="required">
|
|
[% ELSE %]
|
|
<label for="streetnumber">
|
|
[% END %]
|
|
Street number: </label>
|
|
<input type="text" id="streetnumber" name="streetnumber" size="5" maxlength="10" value="[% patron.streetnumber | html %]" />
|
|
[% IF ( mandatorystreetnumber ) %]<span class="required">Required</span>[% END %]
|
|
</li>
|
|
[% END %]
|
|
[% END %]
|
|
|
|
[% BLOCK 'address-style_address2' %]
|
|
[% UNLESS noaddress2 %]
|
|
<li>
|
|
[% IF ( mandatoryaddress2 ) %]
|
|
<label for="address2" class="required">
|
|
[% ELSE %]
|
|
<label for="address2">
|
|
[% END %]
|
|
Address 2: </label>
|
|
<input type="text" id="address2" name="address2" size="40" value="[% patron.address2 | html %]" />
|
|
[% IF ( mandatoryaddress2 ) %]<span class="required">Required</span>[% END %]
|
|
</li>
|
|
[% END %]
|
|
[% END %]
|
|
|
|
[% BLOCK 'address-style_zipcode' %]
|
|
[% UNLESS nozipcode %]
|
|
<li>
|
|
[% IF ( mandatoryzipcode ) %]
|
|
<label for="zipcode" class="required">
|
|
[% ELSE %]
|
|
<label for="zipcode">
|
|
[% END %]
|
|
ZIP/Postal code: </label>
|
|
<input type="text" id="zipcode" name="zipcode" maxlength="10" size="10" value="[% patron.zipcode | html %]" />
|
|
[% IF ( mandatoryzipcode ) %]<span class="required">Required</span>[% END %]
|
|
</li>
|
|
[% END %]
|
|
[% END %]
|
|
|
|
[% BLOCK 'address-style_city' %]
|
|
[% UNLESS nocity %]
|
|
<li>
|
|
[% IF ( mandatorycity ) %]
|
|
<label for="city" class="required" >
|
|
[% ELSE %]
|
|
<label for="city">
|
|
[% END %]
|
|
City: </label>
|
|
<input type="text" id="city" name="city" size="20" value="[% patron.city | html %]" />
|
|
[% IF cities.count %]
|
|
or choose
|
|
<select class="select_city" data_addressfield="" name="select_city">
|
|
<option value="|||"></option>
|
|
[% FOREACH c IN cities %]
|
|
[% IF c.city_name == patron.city && c.city_state == patron.state && c.city_zipcode == patron.zipcode %]
|
|
<option value="[% c.city_zipcode | html %]|[% c.city_name | html %]|[% c.city_state | html %]|[% c.city_country | html %]" selected="selected">
|
|
[% ELSE %]
|
|
<option value="[% c.city_zipcode | html %]|[% c.city_name | html %]|[% c.city_state | html %]|[% c.city_country | html %]">
|
|
[% END %]
|
|
[% c.city_name | html %] [% c.city_state | html %] [% c.city_zipcode | html %]
|
|
</option>
|
|
[% END %]
|
|
</select>
|
|
[% END %]
|
|
[% IF ( mandatorycity ) %]<span class="required">Required</span>[% END %]
|
|
</li>
|
|
[% END %]
|
|
[% END %]
|
|
|
|
[% BLOCK 'address-style_state' %]
|
|
[% UNLESS nostate %]
|
|
<li>
|
|
[% IF ( mandatorystate ) %]
|
|
<label for="state" class="required" >
|
|
[% ELSE %]
|
|
<label for="state">
|
|
[% END %]
|
|
State: </label>
|
|
<input type="text" id="state" name="state" size="20" value="[% patron.state | html %]" />
|
|
[% IF ( mandatorystate ) %]<span class="required">Required</span>[% END %]
|
|
</li>
|
|
[% END %]
|
|
[% END %]
|
|
|
|
[% BLOCK 'address-style_country' %]
|
|
[% UNLESS nocountry %]
|
|
<li>
|
|
[% IF ( mandatorycountry ) %]
|
|
<label for="country" class="required">
|
|
[% ELSE %]
|
|
<label for="country">
|
|
[% END %]
|
|
Country: </label>
|
|
<input type="text" id="country" name="country" size="20" value="[% patron.country | html %]" />
|
|
[% IF ( mandatorycountry ) %]<span class="required">Required</span>[% END %]
|
|
</li>
|
|
[% END %]
|
|
[% END %]
|