Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

BugFix: email-in on categories wasn't null-ed properly 

Causing a problem if two categories got saved with an empty string because the corresponding Database constraint on the index would complain about dublicate values
This commit is contained in:
Benjamin Kampmann 2014-03-05 00:42:05 +01:00
parent 23aa478473
commit bf77c84095
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/controllers/categories_controller.rb
View File

@ -60,6 +60,10 @@ class CategoriesController < ApplicationController
if category_params[:position] if category_params[:position]
category_params[:position] == 'default' ? cat.use_default_position : cat.move_to(category_params[:position].to_i) category_params[:position] == 'default' ? cat.use_default_position : cat.move_to(category_params[:position].to_i)
end end
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
category_params[:email_in] = nil
end
category_params.delete(:position) category_params.delete(:position)
cat.update_attributes(category_params) cat.update_attributes(category_params)
} }