From 30c5b1675fb278cac8591547d25e24f478776a91 Mon Sep 17 00:00:00 2001 From: Soufiane Date: Fri, 2 Jun 2023 15:35:29 +0200 Subject: [PATCH] Missing warning messages when setting up new user [SCI-8595] (#5548) * Fix form errors in users invitation edit [SCI-8595] Co-authored-by: Sboursen * Fix form errors in users confirmation new [SCI-8595] Co-authored-by: Sboursen * Fix form errors in users registration [SCI-8595] Co-authored-by: Sboursen --------- Co-authored-by: Sboursen --- app/assets/javascripts/users/confirmation/new.js | 4 ++-- app/assets/javascripts/users/invitations/resource_errors.js | 4 ++-- app/assets/javascripts/users/invitations/team_errors.js | 4 ++-- .../javascripts/users/registrations/new_with_provider.js | 4 ++-- app/assets/javascripts/users/registrations/resource_errors.js | 4 ++-- app/assets/javascripts/users/registrations/team_errors.js | 4 ++-- app/views/users/confirmations/new.html.erb | 2 +- app/views/users/invitations/edit.html.erb | 2 +- app/views/users/registrations/new.html.erb | 4 ++-- app/views/users/registrations/new_with_provider.html.erb | 4 ++-- 10 files changed, 18 insertions(+), 18 deletions(-) diff --git a/app/assets/javascripts/users/confirmation/new.js b/app/assets/javascripts/users/confirmation/new.js index d7fe03dd6..b578104d0 100644 --- a/app/assets/javascripts/users/confirmation/new.js +++ b/app/assets/javascripts/users/confirmation/new.js @@ -1,4 +1,4 @@ (function() { - const formErrors = JSON.parse($('#form-error-data').data('form-errors')); - $('.confimation-form').render_form_errors('user', formErrors, false); + const formErrors = $('#form-error-data').data('form-errors'); + $('form').renderFormErrors('user', formErrors, false); }()); diff --git a/app/assets/javascripts/users/invitations/resource_errors.js b/app/assets/javascripts/users/invitations/resource_errors.js index 4351521d8..ed4944e79 100644 --- a/app/assets/javascripts/users/invitations/resource_errors.js +++ b/app/assets/javascripts/users/invitations/resource_errors.js @@ -1,4 +1,4 @@ (function() { - const formErrors = JSON.parse($('#resource-error-data').data('form-errors')); - $('form').render_form_errors('user', formErrors, false); + const formErrors = $('#resource-error-data').data('form-errors'); + $('form').renderFormErrors('user', formErrors, false); }()); diff --git a/app/assets/javascripts/users/invitations/team_errors.js b/app/assets/javascripts/users/invitations/team_errors.js index 6c3697953..44891ef72 100644 --- a/app/assets/javascripts/users/invitations/team_errors.js +++ b/app/assets/javascripts/users/invitations/team_errors.js @@ -1,4 +1,4 @@ (function() { - const formErrors = JSON.parse($('#team-error-data').data('form-errors')); - $('form').render_form_errors('team', formErrors, false); + const formErrors = $('#team-error-data').data('form-errors'); + $('form').renderFormErrors('team', formErrors, false); }()); diff --git a/app/assets/javascripts/users/registrations/new_with_provider.js b/app/assets/javascripts/users/registrations/new_with_provider.js index 81f2ec033..45b7803c5 100644 --- a/app/assets/javascripts/users/registrations/new_with_provider.js +++ b/app/assets/javascripts/users/registrations/new_with_provider.js @@ -1,4 +1,4 @@ (function() { - const formErrors = JSON.parse($('#form-error-data').data('form-errors')); - $('form').render_form_errors('team', formErrors, false); + const formErrors = $('#form-error-data').data('form-errors'); + $('form').renderFormErrors('team', formErrors, false); }()); diff --git a/app/assets/javascripts/users/registrations/resource_errors.js b/app/assets/javascripts/users/registrations/resource_errors.js index 4351521d8..ed4944e79 100644 --- a/app/assets/javascripts/users/registrations/resource_errors.js +++ b/app/assets/javascripts/users/registrations/resource_errors.js @@ -1,4 +1,4 @@ (function() { - const formErrors = JSON.parse($('#resource-error-data').data('form-errors')); - $('form').render_form_errors('user', formErrors, false); + const formErrors = $('#resource-error-data').data('form-errors'); + $('form').renderFormErrors('user', formErrors, false); }()); diff --git a/app/assets/javascripts/users/registrations/team_errors.js b/app/assets/javascripts/users/registrations/team_errors.js index 6c3697953..44891ef72 100644 --- a/app/assets/javascripts/users/registrations/team_errors.js +++ b/app/assets/javascripts/users/registrations/team_errors.js @@ -1,4 +1,4 @@ (function() { - const formErrors = JSON.parse($('#team-error-data').data('form-errors')); - $('form').render_form_errors('team', formErrors, false); + const formErrors = $('#team-error-data').data('form-errors'); + $('form').renderFormErrors('team', formErrors, false); }()); diff --git a/app/views/users/confirmations/new.html.erb b/app/views/users/confirmations/new.html.erb index 9887dcd28..9fad440b4 100644 --- a/app/views/users/confirmations/new.html.erb +++ b/app/views/users/confirmations/new.html.erb @@ -21,7 +21,7 @@ <% if resource.errors.present? %> - <%= form_errors = {} %> + <% form_errors = {} %> <% resource.errors.each do |err, msg| %> <% form_errors[err] = (msg == "not found") ? ["Email not found"] : [msg] %> diff --git a/app/views/users/invitations/edit.html.erb b/app/views/users/invitations/edit.html.erb index ba0b521ee..65a37614b 100644 --- a/app/views/users/invitations/edit.html.erb +++ b/app/views/users/invitations/edit.html.erb @@ -56,7 +56,7 @@ <%= render partial: 'users/sessions/login_disclaimer'%> <% if resource && resource.errors.present? %> - <%= form_errors = {} %> + <% form_errors = {} %> <% resource.errors.as_json.each do |err, messages| %> <% form_errors[err] = [] %> diff --git a/app/views/users/registrations/new.html.erb b/app/views/users/registrations/new.html.erb index 1ca215a8f..a012a1a14 100644 --- a/app/views/users/registrations/new.html.erb +++ b/app/views/users/registrations/new.html.erb @@ -64,7 +64,7 @@ <%= render partial: 'users/sessions/login_disclaimer'%> <% if resource && resource.errors.present? %> - <%= form_errors = {} %> + <% form_errors = {} %> <% resource.errors.as_json.each do |err, messages| %> <% form_errors[err] = [] %> @@ -78,7 +78,7 @@ <% if @team && @team.errors.present? %> - <%= form_errors = {} %> + <% form_errors = {} %> <% @team.errors.as_json.each do |err, messages| %> <% form_errors[err] = [] %> diff --git a/app/views/users/registrations/new_with_provider.html.erb b/app/views/users/registrations/new_with_provider.html.erb index 199af25b2..18f814afb 100644 --- a/app/views/users/registrations/new_with_provider.html.erb +++ b/app/views/users/registrations/new_with_provider.html.erb @@ -23,11 +23,11 @@ <% if @team && @team.errors.present? %> - <%= form_errors = {} %> + <% form_errors = {} %> <% @team.errors.each do |err, msg| %> <% form_errors[err] = [msg] %> <% end %> - <%= javascript_include_tag 'users/registrations/new_with_provider.js', nonce: true %> + <%= javascript_include_tag 'users/registrations/new_with_provider', nonce: true %> <% end %>