Fix registration

TIOJ-INFOR-Online-Judge · Sep 1, 2023 · e75cb47 · e75cb47
1 parent dd9d1fb
commit e75cb47
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/app/controllers/registrations_controller.rb b/app/controllers/registrations_controller.rb
@@ -11,7 +11,7 @@ def edit
   def create
     super
     resource.generate_random_avatar
-    resource.save!
+    resource.save # errors would have already happened and rendered in super
   end
 
   def update

diff --git a/app/views/devise/registrations/edit.html.erb b/app/views/devise/registrations/edit.html.erb
@@ -2,7 +2,7 @@
 <h4 class="page-header">Edit <%= resource_name.to_s.humanize %> <small><%= current_user.username %></small></h4>
 <div class="col-xs-12 col-md-6">
 <%= form_for(resource, as: resource_name, url: registration_path(resource_name), html: { method: :put }) do |f| %>
-  <%= render "devise/shared/error_messages", resource: resource %>
+  <%= render partial: "shared/errors", locals: {errors: resource.errors, item: 'user'} %>
 
   <div class="form-group">
     <%= f.label :nickname %>

diff --git a/app/views/devise/registrations/new.html.erb b/app/views/devise/registrations/new.html.erb
@@ -2,7 +2,7 @@
 <h4 class="page-header">Sign up</h4>
 <div class="col-xs-12 col-md-6">
 <%= form_for(resource, as: resource_name, url: registration_path(resource_name)) do |f| %>
-  <%= render "devise/shared/error_messages", resource: resource %>
+  <%= render partial: "shared/errors", locals: {errors: resource.errors, item: 'user'} %>
 
   <div class="form-group">
     <%= f.label :email %>