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

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/member-alt-address-style.inc (-1 / +1 lines)
Lines 57-63 Link Here
57
57
58
[% BLOCK 'alt-address-style_roadtypes' %]
58
[% BLOCK 'alt-address-style_roadtypes' %]
59
    [% SET roadtypes = AuthorisedValues.GetAuthValueDropbox('ROADTYPE') %]
59
    [% SET roadtypes = AuthorisedValues.GetAuthValueDropbox('ROADTYPE') %]
60
    [% IF roadtypes %]
60
    [% IF roadtypes.count %]
61
        [% UNLESS noB_streettype %]
61
        [% UNLESS noB_streettype %]
62
            <li>
62
            <li>
63
                [% IF ( mandatoryB_streettype ) %]
63
                [% IF ( mandatoryB_streettype ) %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/member-main-address-style.inc (-1 / +1 lines)
Lines 48-54 Link Here
48
48
49
[% BLOCK 'address-style_roadtypes' %]
49
[% BLOCK 'address-style_roadtypes' %]
50
    [% SET roadtypes = AuthorisedValues.GetAuthValueDropbox('ROADTYPE') %]
50
    [% SET roadtypes = AuthorisedValues.GetAuthValueDropbox('ROADTYPE') %]
51
    [% IF roadtypes %]
51
    [% IF roadtypes.count %]
52
        [% UNLESS nostreettype %]
52
        [% UNLESS nostreettype %]
53
            <li>
53
            <li>
54
                [% IF ( mandatorystreettype ) %]
54
                [% IF ( mandatorystreettype ) %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/article-requests.tt (-1 / +1 lines)
Lines 102-108 Link Here
102
102
103
                    <fieldset class="action">
103
                    <fieldset class="action">
104
                        [% SET ar_cancellation = AuthorisedValues.GetAuthValueDropbox('AR_CANCELLATION') %]
104
                        [% SET ar_cancellation = AuthorisedValues.GetAuthValueDropbox('AR_CANCELLATION') %]
105
                        [% IF ar_cancellation %]
105
                        [% IF ar_cancellation.count %]
106
                            <label for="cancellation-reason" class="col-sm-4">Cancellation reason: </label>
106
                            <label for="cancellation-reason" class="col-sm-4">Cancellation reason: </label>
107
                            <select class="cancellation-reason col-sm-8" name="cancellation-reason" id="modal-cancellation-reason">
107
                            <select class="cancellation-reason col-sm-8" name="cancellation-reason" id="modal-cancellation-reason">
108
                                <option value="" selected>Other reasons</option>
108
                                <option value="" selected>Other reasons</option>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt (-1 / +1 lines)
Lines 902-908 Link Here
902
                                    <input type="submit" class="cancel" name="submit" value="Cancel marked holds" />
902
                                    <input type="submit" class="cancel" name="submit" value="Cancel marked holds" />
903
903
904
                                    [% SET hold_cancellation = AuthorisedValues.GetAuthValueDropbox('HOLD_CANCELLATION') %]
904
                                    [% SET hold_cancellation = AuthorisedValues.GetAuthValueDropbox('HOLD_CANCELLATION') %]
905
                                    [% IF hold_cancellation %]
905
                                    [% IF hold_cancellation.count %]
906
                                        <select name="cancellation-reason">
906
                                        <select name="cancellation-reason">
907
                                            <option value="">No reason given</option>
907
                                            <option value="">No reason given</option>
908
                                            [% FOREACH reason IN hold_cancellation %]
908
                                            [% FOREACH reason IN hold_cancellation %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tt (-1 / +1 lines)
Lines 189-195 Link Here
189
                <input type="hidden" name="reserve_id" value="[% hold.reserve_id | html %]" />
189
                <input type="hidden" name="reserve_id" value="[% hold.reserve_id | html %]" />
190
190
191
                [% SET hold_cancellation = AuthorisedValues.GetAuthValueDropbox('HOLD_CANCELLATION') %]
191
                [% SET hold_cancellation = AuthorisedValues.GetAuthValueDropbox('HOLD_CANCELLATION') %]
192
                [% IF hold_cancellation %]
192
                [% IF hold_cancellation.count %]
193
                    <div class="form-group">
193
                    <div class="form-group">
194
                        <label for="cancellation-reason">Cancellation reason:</label>
194
                        <label for="cancellation-reason">Cancellation reason:</label>
195
                        <select class="cancellation-reason" name="cancellation-reason" id="cancellation-reason">
195
                        <select class="cancellation-reason" name="cancellation-reason" id="cancellation-reason">
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/request-article.tt (-1 / +1 lines)
Lines 33-39 Link Here
33
33
34
                    <fieldset class="action">
34
                    <fieldset class="action">
35
                        [% SET ar_cancellation = AuthorisedValues.GetAuthValueDropbox('AR_CANCELLATION') %]
35
                        [% SET ar_cancellation = AuthorisedValues.GetAuthValueDropbox('AR_CANCELLATION') %]
36
                        [% IF ar_cancellation %]
36
                        [% IF ar_cancellation.count %]
37
                            <label for="cancellation-reason" class="col-sm-4">Cancellation reason: </label>
37
                            <label for="cancellation-reason" class="col-sm-4">Cancellation reason: </label>
38
                            <select class="cancellation-reason col-sm-8" name="cancellation-reason" id="modal-cancellation-reason">
38
                            <select class="cancellation-reason col-sm-8" name="cancellation-reason" id="modal-cancellation-reason">
39
                                <option value="" selected>Other reasons</option>
39
                                <option value="" selected>Other reasons</option>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tt (-1 / +1 lines)
Lines 155-161 Link Here
155
155
156
                    <fieldset class="action">
156
                    <fieldset class="action">
157
                        [% SET hold_cancellation = AuthorisedValues.GetAuthValueDropbox('HOLD_CANCELLATION') %]
157
                        [% SET hold_cancellation = AuthorisedValues.GetAuthValueDropbox('HOLD_CANCELLATION') %]
158
                        [% IF hold_cancellation %]
158
                        [% IF hold_cancellation.count %]
159
                            <label for="cancellation-reason">Cancellation reason: </label>
159
                            <label for="cancellation-reason">Cancellation reason: </label>
160
                            <select class="cancellation-reason" name="modal-cancellation-reason" id="modal-cancellation-reason">
160
                            <select class="cancellation-reason" name="modal-cancellation-reason" id="modal-cancellation-reason">
161
                                <option value="">No reason given</option>
161
                                <option value="">No reason given</option>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt (-1 / +1 lines)
Lines 775-781 Link Here
775
                                            <input type="submit" class="cancel" name="submit" value="Cancel marked holds" />
775
                                            <input type="submit" class="cancel" name="submit" value="Cancel marked holds" />
776
776
777
                                            [% SET hold_cancellation = AuthorisedValues.GetAuthValueDropbox('HOLD_CANCELLATION') %]
777
                                            [% SET hold_cancellation = AuthorisedValues.GetAuthValueDropbox('HOLD_CANCELLATION') %]
778
                                            [% IF hold_cancellation %]
778
                                            [% IF hold_cancellation.count %]
779
                                                <label for="cancellation-reason">Cancellation reason:</label>
779
                                                <label for="cancellation-reason">Cancellation reason:</label>
780
                                                <select name="cancellation-reason">
780
                                                <select name="cancellation-reason">
781
                                                    <option value="">No reason given</option>
781
                                                    <option value="">No reason given</option>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt (-2 / +2 lines)
Lines 935-941 Link Here
935
                            <input type="submit" name="submit" value="Update hold(s)" /> <button class="cancel_selected_holds" data-bulk="true"></button>
935
                            <input type="submit" name="submit" value="Update hold(s)" /> <button class="cancel_selected_holds" data-bulk="true"></button>
936
                        <fieldset id="cancellation-reason-fieldset" class="action">
936
                        <fieldset id="cancellation-reason-fieldset" class="action">
937
                            [% SET hold_cancellation = AuthorisedValues.GetAuthValueDropbox('HOLD_CANCELLATION') %]
937
                            [% SET hold_cancellation = AuthorisedValues.GetAuthValueDropbox('HOLD_CANCELLATION') %]
938
                            [% IF hold_cancellation %]
938
                            [% IF hold_cancellation.count %]
939
                                <label for="cancellation-reason">Cancellation reason: </label>
939
                                <label for="cancellation-reason">Cancellation reason: </label>
940
                                <select class="cancellation-reason" name="cancellation-reason" id="cancellation-reason">
940
                                <select class="cancellation-reason" name="cancellation-reason" id="cancellation-reason">
941
                                    <option value="">No reason given</option>
941
                                    <option value="">No reason given</option>
Lines 1121-1127 Link Here
1121
1121
1122
                    <fieldset class="action">
1122
                    <fieldset class="action">
1123
                        [% SET hold_cancellation = AuthorisedValues.GetAuthValueDropbox('HOLD_CANCELLATION') %]
1123
                        [% SET hold_cancellation = AuthorisedValues.GetAuthValueDropbox('HOLD_CANCELLATION') %]
1124
                        [% IF hold_cancellation %]
1124
                        [% IF hold_cancellation.count %]
1125
                            <label for="cancellation-reason">Cancellation reason: </label>
1125
                            <label for="cancellation-reason">Cancellation reason: </label>
1126
                            <select class="cancellation-reason" name="modal-cancellation-reason" id="modal-cancellation-reason">
1126
                            <select class="cancellation-reason" name="modal-cancellation-reason" id="modal-cancellation-reason">
1127
                                <option value="">No reason given</option>
1127
                                <option value="">No reason given</option>
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/includes/av-build-dropbox.inc (-1 / +1 lines)
Lines 9-15 Link Here
9
[% SET avs = AuthorisedValues.GetAuthValueDropbox( category ) %]
9
[% SET avs = AuthorisedValues.GetAuthValueDropbox( category ) %]
10
[% DEFAULT class = '' size = 20 %]
10
[% DEFAULT class = '' size = 20 %]
11
11
12
[% IF avs %]
12
[% IF avs.count %]
13
  [% IF required %]
13
  [% IF required %]
14
      <select id="[% name | html %]" name="[% name | html %]" class="[% class | html %]" required="required">
14
      <select id="[% name | html %]" name="[% name | html %]" class="[% class | html %]" required="required">
15
  [% ELSE %]
15
  [% ELSE %]
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-memberentry.tt (-3 / +2 lines)
Lines 427-433 Link Here
427
                                        [% IF Koha.Preference('AddressFormat') != 'de' %][% INCLUDE streetnumber %][% END %]
427
                                        [% IF Koha.Preference('AddressFormat') != 'de' %][% INCLUDE streetnumber %][% END %]
428
428
429
                                        [% SET roadtypes = AuthorisedValues.GetAuthValueDropbox('ROADTYPE') %]
429
                                        [% SET roadtypes = AuthorisedValues.GetAuthValueDropbox('ROADTYPE') %]
430
                                        [% IF roadtypes %]
430
                                        [% IF roadtypes.count %]
431
                                            [% UNLESS hidden.defined('streettype') %]
431
                                            [% UNLESS hidden.defined('streettype') %]
432
                                                <li>
432
                                                <li>
433
                                                    <label for="borrower_streettype" class="[% required.streettype | html %]">Street type:</label>
433
                                                    <label for="borrower_streettype" class="[% required.streettype | html %]">Street type:</label>
Lines 651-657 Link Here
651
651
652
                                    <ol>
652
                                    <ol>
653
                                        [% SET roadtypes = AuthorisedValues.GetAuthValueDropbox('ROADTYPE') %]
653
                                        [% SET roadtypes = AuthorisedValues.GetAuthValueDropbox('ROADTYPE') %]
654
                                        [% IF roadtypes %]
654
                                        [% IF roadtypes.count %]
655
                                            [% UNLESS hidden.defined('B_streettype') %]
655
                                            [% UNLESS hidden.defined('B_streettype') %]
656
                                                <li>
656
                                                <li>
657
                                                    <label for="borrower_B_streettype" class="[% required.B_streettype | html %]">Street type:</label>
657
                                                    <label for="borrower_B_streettype" class="[% required.B_streettype | html %]">Street type:</label>
658
- 

Return to bug 30603