codeninjasllc/discourse
1
0
Fork 0
mirror of https://github.com/codeninjasllc/discourse.git synced 2024-11-27 17:46:05 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #3383 from techAPJ/patch-4

Browse source 
FIX: handle error for duplicate email_in address
This commit is contained in:
Robin Ward 2015-04-16 11:13:36 -04:00
commit 94fea09416
3 changed files with 12 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
app/controllers/categories_controller.rb
View file

@ -87,6 +87,9 @@ class CategoriesController < ApplicationController
if category_params.key? :email_in and category_params[:email_in].length == 0 if category_params.key? :email_in and category_params[:email_in].length == 0
# properly null the value so the database constrain doesn't catch us # properly null the value so the database constrain doesn't catch us
category_params[:email_in] = nil category_params[:email_in] = nil
elsif category_params.key? :email_in and existing_category = Category.find_by(email_in: category_params[:email_in]) and existing_category.id != @category.id
# check if email_in address is already in use for other category
return render_json_error I18n.t('category.errors.email_in_already_exist', {email_in: category_params[:email_in], category_name: existing_category.name})
end end
category_params.delete(:position) category_params.delete(:position)

1
config/locales/server.en.yml
View file

@ -341,6 +341,7 @@ en:
uncategorized_parent: "Uncategorized can't have a parent category" uncategorized_parent: "Uncategorized can't have a parent category"
self_parent: "A subcategory's parent cannot be itself" self_parent: "A subcategory's parent cannot be itself"
depth: "You can't nest a subcategory under another" depth: "You can't nest a subcategory under another"
email_in_already_exist: "Incoming email address '%{email_in}' is already in use for '%{category_name}' category."
cannot_delete: cannot_delete:
uncategorized: "Can't delete Uncategorized" uncategorized: "Can't delete Uncategorized"
has_subcategories: "Can't delete this category because it has sub-categories." has_subcategories: "Can't delete this category because it has sub-categories."

8
spec/controllers/categories_controller_spec.rb
View file

@ -174,6 +174,14 @@ describe CategoriesController do
end end
end end
it "returns 422 if email_in address is already in use for other category" do
@other_category = Fabricate(:category, name: "Other", email_in: "mail@examle.com" )
xhr :put, :update, id: @category.id, name: "Email", email_in: "mail@examle.com", color: "ff0", text_color: "fff"
expect(response).not_to be_success
expect(response.code.to_i).to eq(422)
end
describe "success" do describe "success" do
it "updates the group correctly" do it "updates the group correctly" do