diff options
author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2013-12-14 08:22:43 +0000 |
---|---|---|
committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2013-12-14 08:22:43 +0000 |
commit | 2e2e2cfe425c2664517fb59836fbd3eff5e35861 (patch) | |
tree | e3daa66ee8b36d2f1a1468ec9501fba5bc37d71c /app/controllers | |
parent | c74f6d9f9bcf02ccc480a2028802b83ec5d91aca (diff) | |
download | redmine-2e2e2cfe425c2664517fb59836fbd3eff5e35861.tar.gz redmine-2e2e2cfe425c2664517fb59836fbd3eff5e35861.zip |
Merged custom fields format refactoring.
git-svn-id: http://svn.redmine.org/redmine/trunk@12400 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app/controllers')
-rw-r--r-- | app/controllers/custom_fields_controller.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/controllers/custom_fields_controller.rb b/app/controllers/custom_fields_controller.rb index 95d0d507f..6fd9cd58c 100644 --- a/app/controllers/custom_fields_controller.rb +++ b/app/controllers/custom_fields_controller.rb @@ -36,6 +36,8 @@ class CustomFieldsController < ApplicationController end def new + @custom_field.field_format = 'string' if @custom_field.field_format.blank? + @custom_field.default_value = nil end def create @@ -76,8 +78,6 @@ class CustomFieldsController < ApplicationController @custom_field = CustomField.new_subclass_instance(params[:type], params[:custom_field]) if @custom_field.nil? render_404 - else - @custom_field.default_value = nil end end |