Skip to content

Commit e75cb47

Browse files
committed
Fix registration
1 parent dd9d1fb commit e75cb47

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

app/controllers/registrations_controller.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ def edit
1111
def create
1212
super
1313
resource.generate_random_avatar
14-
resource.save!
14+
resource.save # errors would have already happened and rendered in super
1515
end
1616

1717
def update

app/views/devise/registrations/edit.html.erb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<h4 class="page-header">Edit <%= resource_name.to_s.humanize %> <small><%= current_user.username %></small></h4>
33
<div class="col-xs-12 col-md-6">
44
<%= form_for(resource, as: resource_name, url: registration_path(resource_name), html: { method: :put }) do |f| %>
5-
<%= render "devise/shared/error_messages", resource: resource %>
5+
<%= render partial: "shared/errors", locals: {errors: resource.errors, item: 'user'} %>
66

77
<div class="form-group">
88
<%= f.label :nickname %>

app/views/devise/registrations/new.html.erb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<h4 class="page-header">Sign up</h4>
33
<div class="col-xs-12 col-md-6">
44
<%= form_for(resource, as: resource_name, url: registration_path(resource_name)) do |f| %>
5-
<%= render "devise/shared/error_messages", resource: resource %>
5+
<%= render partial: "shared/errors", locals: {errors: resource.errors, item: 'user'} %>
66

77
<div class="form-group">
88
<%= f.label :email %>

0 commit comments

Comments
 (0)