Commit a1bbd913 authored by Patrick Schmalstig's avatar Patrick Schmalstig
Browse files

Fixed MANTIS-5904 (Required field validation applies to ticks when it should not)

parent 72f3d366

cms/pages/modules/cms_catalogues.php

+2 −2
Original line number Diff line number Diff line
@@ -775,8 +775,8 @@ class Module_cms_catalogues extends Standard_crud_module 
                $value = $object->inputted_to_field_value($editing_id !== null, $field, 'uploads/catalogues', ($editing_id === null) ? null : _get_catalogue_entry_field($field['id'], $editing_id, $storage_type));

            }



            // Required field validation (a standard for all field hooks)

            if (($field['cf_required'] == 1) && (($value == '') || ($value === null) || (($value == STRING_MAGIC_NULL) && !fractional_edit()))) {

            // Required field validation (a standard for all field hooks except tick)

            if (($field['cf_type'] != 'tick') && ($field['cf_required'] == 1) && (($value == '') || ($value === null) || (($value == STRING_MAGIC_NULL) && !fractional_edit()))) {

                warn_exit(do_lang_tempcode('_REQUIRED_NOT_FILLED_IN', get_translated_tempcode('catalogue_fields', $field, 'cf_name')));

            }

sources/blocks/main_catalogues_form.php

+2 −2
Original line number Diff line number Diff line
@@ -141,8 +141,8 @@ PHP; 
                $ob = get_fields_hook($field['cf_type']);

                $inputted_value = $ob->inputted_to_field_value(false, $field, null);



                // Required field validation (a standard for all field hooks)

                if (($field['cf_required'] == 1) && (($inputted_value == '') || ($inputted_value === null) || (($inputted_value == STRING_MAGIC_NULL) && !fractional_edit()))) {

                // Required field validation (a standard for all field hooks except tick)

                if (($field['cf_type'] != 'tick') && ($field['cf_required'] == 1) && (($inputted_value == '') || ($inputted_value === null) || (($inputted_value == STRING_MAGIC_NULL) && !fractional_edit()))) {

                    return do_template('RED_ALERT', ['_GUID' => 'ae4e4f4f2a3423bf141faa953ee8a705', 'TEXT' => do_lang_tempcode('_REQUIRED_NOT_FILLED_IN', get_translated_tempcode('catalogue_fields', $field, 'cf_name'))]);

                }

sources/blocks/main_contact_catalogues.php

+2 −2
Original line number Diff line number Diff line
@@ -140,8 +140,8 @@ PHP; 
                $ob = get_fields_hook($field['cf_type']);

                $inputted_value = $ob->inputted_to_field_value(false, $field, null);



                // Required field validation (a standard for all field hooks)

                if (($field['cf_required'] == 1) && (($inputted_value == '') || ($inputted_value === null) || (($inputted_value == STRING_MAGIC_NULL) && !fractional_edit()))) {

                // Required field validation (a standard for all field hooks except tick)

                if (($field['cf_type'] != 'tick') && ($field['cf_required'] == 1) && (($inputted_value == '') || ($inputted_value === null) || (($inputted_value == STRING_MAGIC_NULL) && !fractional_edit()))) {

                    return do_template('RED_ALERT', ['_GUID' => 'cee591bbaf826cee57a152b641ce831e', 'TEXT' => do_lang_tempcode('_REQUIRED_NOT_FILLED_IN', get_translated_tempcode('catalogue_fields', $field, 'cf_name'))]);

                }

sources/cns_members_action2.php

+2 −2
Original line number Diff line number Diff line
@@ -347,8 +347,8 @@ function cns_read_in_custom_fields(array $custom_fields, ?int $member_id = null) 


        $value = $ob->inputted_to_field_value($member_id !== null, $custom_field, 'uploads/cns_cpf_upload', ($old_value === null) ? null : ['cv_value' => $old_value]);



        // Required field validation (a standard for all field hooks)

        if (($custom_field['cf_required'] == 1) && (($value == '') || ($value === null) || (($value == STRING_MAGIC_NULL) && !fractional_edit()))) {

        // Required field validation (a standard for all field hooks except tick)

        if (($custom_field['cf_type'] != 'tick') && ($custom_field['cf_required'] == 1) && (($value == '') || ($value === null) || (($value == STRING_MAGIC_NULL) && !fractional_edit()))) {

            warn_exit(do_lang_tempcode('_REQUIRED_NOT_FILLED_IN', get_translated_tempcode('f_custom_fields', $custom_field, 'cf_name')));

        }

sources/decision_tree.php

+2 −2
Original line number Diff line number Diff line
@@ -433,8 +433,8 @@ class DecisionTree 
                    }

                    $val = $hook_ob->inputted_to_field_value(false, $field);



                    // Required field validation (a standard for all field hooks)

                    if (($field['cf_required'] == 1) && (($val == '') || ($val === null) || (($val == STRING_MAGIC_NULL) && !fractional_edit()))) {

                    // Required field validation (a standard for all field hooks except tick)

                    if (($field['cf_type'] != 'tick') && ($field['cf_required'] == 1) && (($val == '') || ($val === null) || (($val == STRING_MAGIC_NULL) && !fractional_edit()))) {

                        warn_exit(do_lang_tempcode('_REQUIRED_NOT_FILLED_IN', escape_html($field['cf_input_name'])));

                    }