Jonathan Druart
0ab22e1c7c
In order to simplify and make uniform the code, the controller scripts send a Koha::Patron object to the templates instead of all attributes of a patron. That will make the code much more easier to maintain and will be less error-prone. The variable "patron" sent to the templates is supposed to represent the patron the librarian is editing the detail. In the members module and some scripts of the circulation module, the patron's detail are sent one by one to the template. That leads to frustration from developpers (making sure everything is passed from all scripts) and to regression (we got tone of bugs in the last year because of this way to do). With this patch set it will be easy access patron's detail, passing only 1 variable from the controllers. Test plan: Play with the patron and circulation module and make sur the detail of the patron you are editing/seeing info are correctly displayed. Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> Signed-off-by: Josef Moravec <josef.moravec@gmail.com> Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
125 lines
4.5 KiB
HTML
125 lines
4.5 KiB
HTML
<fieldset class="rows" id="memberentry_mainaddress">
|
|
<legend id="main_address_lgd">Main address</legend><ol>
|
|
[% 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" value="[% patron.streetnumber %]" />
|
|
[% IF ( mandatorystreetnumber ) %]<span class="required">Required</span>[% END %]
|
|
</li>
|
|
[% END %]
|
|
[% UNLESS nostreettype %]
|
|
[% 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 %]" selected="selected">[% roadtype.lib %]</option>
|
|
[% ELSE %]
|
|
<option value="[% roadtype.authorised_value %]">[% roadtype.lib %]</option>
|
|
[% END %]
|
|
[% END %]
|
|
</select>
|
|
[% IF ( mandatorystreettype ) %]<span class="required">Required</span>[% END %]
|
|
</li>
|
|
[% END %]
|
|
[% END %]
|
|
[% 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="35" value="[% patron.address %]" />
|
|
[% IF ( mandatoryaddress ) %]<span class="required">Required</span>[% END %]
|
|
</li>
|
|
[% END %]
|
|
[% 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="35" value="[% patron.address2 %]" />
|
|
[% IF ( mandatoryaddress2 ) %]<span class="required">Required</span>[% END %]
|
|
</li>
|
|
[% END %]
|
|
[% 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 %]" />
|
|
[% IF cities.count %]or choose
|
|
<select id="select_city" 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 %]|[% c.city_name %]|[% c.city_state %]|[% c.city_country %]" selected="selected">
|
|
[% ELSE %]
|
|
<option value="[% c.city_zipcode %]|[% c.city_name %]|[% c.city_state %]|[% c.city_country %]">
|
|
[% END %]
|
|
[% c.city_name %] [% c.city_state %] [% c.city_zipcode %]
|
|
</option>
|
|
[% END %]
|
|
</select>
|
|
[% END %]
|
|
[% IF ( mandatorycity ) %]<span class="required">Required</span>[% END %]
|
|
</li>
|
|
[% END %]
|
|
[% UNLESS nostate %]
|
|
<li>
|
|
[% IF ( mandatorystate ) %]
|
|
<label for="state" class="required">
|
|
[% ELSE %]
|
|
<label for="state">
|
|
[% END %]
|
|
State: </label>
|
|
<input type="text" name="state" id="state" size="20" value="[% patron.state %]" />
|
|
[% IF ( mandatorystate ) %]<span class="required">Required</span>[% END %]
|
|
</li>
|
|
[% END %]
|
|
[% UNLESS nozipcode %]
|
|
<li>
|
|
[% IF ( mandatoryzipcode ) %]
|
|
<label for="zipcode" class="required">
|
|
[% ELSE %]
|
|
<label for="zipcode">
|
|
[% END %]
|
|
ZIP/Postal code: </label>
|
|
<input type="text" name="zipcode" id="zipcode" size="10" value="[% patron.zipcode %]" />
|
|
[% IF ( mandatoryzipcode ) %]<span class="required">Required</span>[% END %]
|
|
</li>
|
|
[% END %]
|
|
[% UNLESS nocountry %]
|
|
<li>
|
|
[% IF ( mandatorycountry ) %]
|
|
<label for="country" class="required">
|
|
[% ELSE %]
|
|
<label for="country">
|
|
[% END %]
|
|
Country: </label>
|
|
<input type="text" name="country" id="country" size="20" value="[% patron.country %]" />
|
|
[% IF ( mandatorycountry ) %]<span class="required">Required</span>[% END %]
|
|
</li>
|
|
[% END %]
|
|
</ol>
|
|
</fieldset>
|