Skip to content

Commit

Permalink
Merge pull request kennethkalmer#18 from philipmuir/domain_create_err…
Browse files Browse the repository at this point in the history
…or_reporting

Changed domain create error reporting to list errors collected on the domain object
  • Loading branch information
maetl committed Apr 18, 2013
2 parents 1ce82fb + fa8c297 commit cccf15c
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 2 deletions.
2 changes: 1 addition & 1 deletion app/controllers/domains_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ def create

respond_to do |format|
format.html { render :action => :new }
format.all { render :text => t(:message_domain_name_exists), :status => :unprocessable_entity }
format.all { render :json => @domain.errors, :status => :unprocessable_entity }
end

return
Expand Down
1 change: 0 additions & 1 deletion config/locales/en.yml
Original file line number Diff line number Diff line change
Expand Up @@ -512,7 +512,6 @@ en:
message_domain_created: "Domain created"
message_domain_updated: "Domain updated"
message_domain_macro_applied: "Macro applied to domain"
message_domain_name_exists: "Duplicate domain name exists"

# macro_steps_controller
message_macro_step_removed: "Macro step removed"
Expand Down

0 comments on commit cccf15c

Please sign in to comment.