From a87669840cd8d7f9ffdc4b9b67362dd7e1fd2eac Mon Sep 17 00:00:00 2001 From: kikito Date: Tue, 19 Jan 2016 19:46:22 +0100 Subject: [PATCH] Hides fields without errors in finish_signup.html.erb Conflicts: app/views/users/registrations/finish_signup.html.erb --- .../users/registrations/finish_signup.html.erb | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/app/views/users/registrations/finish_signup.html.erb b/app/views/users/registrations/finish_signup.html.erb index a1e1fd8ac..95e8a8098 100644 --- a/app/views/users/registrations/finish_signup.html.erb +++ b/app/views/users/registrations/finish_signup.html.erb @@ -5,9 +5,20 @@ <%= form_for current_user, as: :user, url: do_finish_signup_path, html: { role: 'form'} do |f| %> <%= render 'shared/errors', resource: current_user %> - <%= f.text_field :username, placeholder: t("devise_views.users.registrations.new.username_label"), value: nil %> - <%= f.email_field :email, placeholder: t("devise_views.users.registrations.new.email_label"), value: nil %> - <%= f.submit t("devise_views.users.registrations.new.submit"), class: 'button radius' %> + + <% if current_user.errors.include? :username %> + <%= f.text_field :username, placeholder: t("devise_views.users.registrations.new.username_label"), value: nil %> + <% else %> + <%= f.hidden_field :username %> + <% end %> + + <% if current_user.errors.include? :email %> + <%= f.email_field :email, placeholder: t("devise_views.users.registrations.new.email_label"), value: nil %> + <% else %> + <%= f.hidden_field :email %> + <% end %> + + <%= f.submit t("devise_views.users.registrations.new.submit"), class: 'button radius expand' %> <% end %>