CustomFieldsController refactoring.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2273 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/app/controllers/custom_fields_controller.rb b/app/controllers/custom_fields_controller.rb
index 9b13d19..c9f798f 100644 (file)
--- a/app/controllers/custom_fields_controller.rb
+++ b/app/controllers/custom_fields_controller.rb
@@ -30,19 +30,14 @@ class CustomFieldsController < ApplicationController
   end
   
   def new
-    case params[:type]
-      when "IssueCustomField" 
-        @custom_field = IssueCustomField.new(params[:custom_field])
-      when "UserCustomField" 
-        @custom_field = UserCustomField.new(params[:custom_field])
-      when "ProjectCustomField" 
-        @custom_field = ProjectCustomField.new(params[:custom_field])
-      when "TimeEntryCustomField" 
-        @custom_field = TimeEntryCustomField.new(params[:custom_field])
-      else
-        redirect_to :action => 'list'
-        return
-    end  
+    @custom_field = begin
+      if params[:type].to_s.match(/.+CustomField$/)
+        params[:type].to_s.constantize.new(params[:custom_field])
+      end
+    rescue
+    end
+    redirect_to(:action => 'list') and return unless @custom_field.is_a?(CustomField)
+    
     if request.post? and @custom_field.save
       flash[:notice] = l(:notice_successful_create)
       redirect_to :action => 'list', :tab => @custom_field.class.name

diff --git a/test/functional/custom_fields_controller_test.rb b/test/functional/custom_fields_controller_test.rb
index d77bad5..c37368d 100644 (file)
--- a/test/functional/custom_fields_controller_test.rb
+++ b/test/functional/custom_fields_controller_test.rb
@@ -22,7 +22,7 @@ require 'custom_fields_controller'
 class CustomFieldsController; def rescue_action(e) raise e end; end\r
 \r
 class CustomFieldsControllerTest < Test::Unit::TestCase\r
-  fixtures :custom_fields, :trackers\r
+  fixtures :custom_fields, :trackers, :users\r
   \r
   def setup\r
     @controller = CustomFieldsController.new\r
@@ -53,4 +53,9 @@ class CustomFieldsControllerTest < Test::Unit::TestCase
     assert_equal ["0.1", "0.2"], field.possible_values\r
     assert_equal 1, field.trackers.size\r
   end\r
+  \r
+  def test_invalid_custom_field_class_should_redirect_to_list\r
+    get :new, :type => 'UnknownCustomField'\r
+    assert_redirected_to '/custom_fields/list'\r
+  end\r
 end\r