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

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt (-2 / +20 lines)
Lines 1521-1533 Link Here
1521
                                                        [% END %]
1521
                                                        [% END %]
1522
                                                        [% FOREACH patron_attribute IN pa_loo.items %]
1522
                                                        [% FOREACH patron_attribute IN pa_loo.items %]
1523
                                                            <li data-category_code="[% patron_attribute.category_code | html %]" data-pa_code="[% patron_attribute.code | replace('[^a-zA-Z0-9_-]', '') %]">
1523
                                                            <li data-category_code="[% patron_attribute.category_code | html %]" data-pa_code="[% patron_attribute.code | replace('[^a-zA-Z0-9_-]', '') %]">
1524
                                                                [% IF patron_attribute.mandatory %]
1524
                                                                [% IF patron_attribute.mandatory && patron_attribute.category_code == patron_category.categorycode%]
1525
                                                                    <label for="[% patron_attribute.form_id | html %]" class="required" required="required">[% patron_attribute.description | html %]: </label>
1525
                                                                    <label for="[% patron_attribute.form_id | html %]" class="required" required="required">[% patron_attribute.description | html %]: </label>
1526
                                                                [% ELSIF patron_attribute.mandatory && patron_attribute.category_code != patron_category.categorycode %]
1527
                                                                    <label for="[% patron_attribute.form_id | html %]">[% patron_attribute.description | html %]: </label>
1526
                                                                [% ELSE %]
1528
                                                                [% ELSE %]
1527
                                                                    <label for="[% patron_attribute.form_id | html %]">[% patron_attribute.description | html %]: </label>
1529
                                                                    <label for="[% patron_attribute.form_id | html %]">[% patron_attribute.description | html %]: </label>
1528
                                                                [% END %]
1530
                                                                [% END %]
1529
                                                                [% IF ( patron_attribute.use_dropdown ) %]
1531
                                                                [% IF ( patron_attribute.use_dropdown ) %]
1530
                                                                    <select id="[% patron_attribute.form_id | html %]" name="[% patron_attribute.form_id | html %]" [% IF patron_attribute.mandatory %]required="required"[% END %]>
1532
                                                                    [% IF patron_attribute.mandatory && patron_attribute.category_code == patron_category.categorycode %]
1533
                                                                        <select id="[% patron_attribute.form_id | html %]" name="[% patron_attribute.form_id | html %]" required="required">
1534
                                                                    [% ELSIF patron_attribute.mandatory && patron_attribute.category_code != patron_category.categorycode %]
1535
                                                                        <select id="[% patron_attribute.form_id | html %]" name="[% patron_attribute.form_id | html %]">
1536
                                                                    [% ELSE %]
1537
                                                                        <select id="[% patron_attribute.form_id | html %]" name="[% patron_attribute.form_id | html %]">
1538
                                                                    [% END %]
1531
                                                                        <option value=""></option>
1539
                                                                        <option value=""></option>
1532
                                                                        [% FOREACH auth_val_loo IN patron_attribute.auth_val_loop %]
1540
                                                                        [% FOREACH auth_val_loo IN patron_attribute.auth_val_loop %]
1533
                                                                            [% IF auth_val_loo.authorised_value == patron_attribute.value %]
1541
                                                                            [% IF auth_val_loo.authorised_value == patron_attribute.value %]
Lines 1951-1956 Link Here
1951
            to_api_mapping = [% To.json(to_api_mapping) | $raw %];
1959
            to_api_mapping = [% To.json(to_api_mapping) | $raw %];
1952
        [% END %]
1960
        [% END %]
1953
1961
1962
        //Remove attribute required so hidden new_guarantor_relationship is not validated
1963
        if($(".new_guarantor_relationship").is(":hidden")){
1964
            $(".new_guarantor_relationship").removeAttr('required');;
1965
        }
1966
1967
        //Add attribute required so visible new_guarantor_relationship is validated
1968
        if($(".new_guarantor_relationship").is(":visible")){
1969
            $(".new_guarantor_relationship").prop('required',true);
1970
        }
1971
1954
        var TalkingTechItivaPhoneNotification = [% Koha.Preference('TalkingTechItivaPhoneNotification') || 0 | html %];
1972
        var TalkingTechItivaPhoneNotification = [% Koha.Preference('TalkingTechItivaPhoneNotification') || 0 | html %];
1955
        var PhoneNotification = [% Koha.Preference('PhoneNotification') || 0 | html %];
1973
        var PhoneNotification = [% Koha.Preference('PhoneNotification') || 0 | html %];
1956
    </script>
1974
    </script>
(-)a/koha-tmpl/intranet-tmpl/prog/js/members.js (-1 / +5 lines)
Lines 158-163 function select_user(borrowernumber, borrower, relationship) { Link Here
158
        $("#guarantor_relationships").append(fieldset);
158
        $("#guarantor_relationships").append(fieldset);
159
        fieldset.show();
159
        fieldset.show();
160
160
161
        //Add attribute required so visible new_guarantor_relationship is validated
162
        if($(".new_guarantor_relationship").is(":visible")){
163
            $(".new_guarantor_relationship").prop('required',true);
164
        }
165
161
        if (relationship) {
166
        if (relationship) {
162
            fieldset.find(".new_guarantor_relationship").val(relationship);
167
            fieldset.find(".new_guarantor_relationship").val(relationship);
163
        }
168
        }
164
- 

Return to bug 34671