Merge pull request #4360 from sharetribe/bug_in_signup_form

[Bug] In signup form, error message for custom user fields is in the wrong place
sharetribe · Mar 19, 2021 · 3286c45 · 3286c45
2 parents 62dd7e1 + c518974
commit 3286c45
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/app/assets/javascripts/kassi.js b/app/assets/javascripts/kassi.js
@@ -361,7 +361,10 @@ function initialize_signup_form(locale, email_in_use_message, invalid_invitation
   //name_required = (name_required == 1) ? true : false
   $(form_id).validate({
     errorPlacement: function(errorLabel, element) {
-      if (( /radio|checkbox/i ).test( element[0].type )) {
+      if ($(element).hasClass("signup-custom-checkbox")) {
+         var container = $(element).parents('.checkbox-group-container').prevAll('.inline-label-container').first();
+         errorLabel.insertAfter(container);
+      } else if (( /radio|checkbox/i ).test( element[0].type )) {
         element.closest('.checkbox-container').append(errorLabel);
       } else {
         errorLabel.insertAfter( element );

diff --git a/app/views/settings/custom_fields/_checkbox.haml b/app/views/settings/custom_fields/_checkbox.haml
@@ -7,6 +7,6 @@
           - html_id = "person_custom_fields_#{index}_#{opt.id}"
           - selected = custom_field_value ? custom_field_value.selected_options.include?(opt) : false
           = check_box_tag "#{prefix}[selected_option_ids][]", opt.id, selected,
-            {id: html_id, class: "custom_field_checkbox #{custom_field.required? ? 'required' : ''}",
+            {id: html_id, class: "signup-custom-checkbox custom_field_checkbox #{custom_field.required? ? 'required' : ''}",
             input_group_id: "person_custom_fields_#{index}"}
           = label_tag html_id, "#{opt.title(I18n.locale)}", {class: "light"}