diff app/controllers/custom_fields_controller.rb @ 1517:dffacf8a6908 redmine-2.5

Update to Redmine SVN revision 13367 on 2.5-stable branch
author Chris Cannam
date Tue, 09 Sep 2014 09:29:00 +0100
parents e248c7af89ec
children
line wrap: on
line diff
--- a/app/controllers/custom_fields_controller.rb	Tue Sep 09 09:28:31 2014 +0100
+++ b/app/controllers/custom_fields_controller.rb	Tue Sep 09 09:29:00 2014 +0100
@@ -27,7 +27,6 @@
     respond_to do |format|
       format.html {
         @custom_fields_by_type = CustomField.all.group_by {|f| f.class.name }
-        @tab = params[:tab] || 'IssueCustomField'
       }
       format.api {
         @custom_fields = CustomField.all
@@ -36,6 +35,8 @@
   end
 
   def new
+    @custom_field.field_format = 'string' if @custom_field.field_format.blank?
+    @custom_field.default_value = nil
   end
 
   def create
@@ -75,9 +76,7 @@
   def build_new_custom_field
     @custom_field = CustomField.new_subclass_instance(params[:type], params[:custom_field])
     if @custom_field.nil?
-      render_404
-    else
-      @custom_field.default_value = nil
+      render :action => 'select_type'
     end
   end