jro_apps/redmine Commit - r2271:48295a6c4b9a

CustomFieldsController refactoring....

Jean-Philippe Lang -

r2271:48295a6c4b9a

parent child

Context file:

r2271:48295a6c4b9a

Collapse all files

app/controllers/custom_fields_controller.rb +8 -13

             # redMine - project management software
             # Copyright (C) 2006  Jean-Philippe Lang
             #
             # This program is free software; you can redistribute it and/or
             # modify it under the terms of the GNU General Public License
             # as published by the Free Software Foundation; either version 2
             # of the License, or (at your option) any later version.
             #
             # This program is distributed in the hope that it will be useful,
             # but WITHOUT ANY WARRANTY; without even the implied warranty of
             # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
             # GNU General Public License for more details.
             #
             # You should have received a copy of the GNU General Public License
             # along with this program; if not, write to the Free Software
             # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             class CustomFieldsController < ApplicationController
               before_filter :require_admin
               def index
                 list
                 render :action => 'list' unless request.xhr?
               end
               def list
                 @custom_fields_by_type = CustomField.find(:all).group_by {|f| f.class.name }
                 @tab = params[:tab] || 'IssueCustomField'
                 render :action => "list", :layout => false if request.xhr?
               end
               def new
-                case params[:type]
+                @custom_field = begin
-                  when "IssueCustomField"
+                  if params[:type].to_s.match(/.+CustomField$/)
-                    @custom_field = IssueCustomField.new(params[:custom_field])
+                    params[:type].to_s.constantize.new(params[:custom_field])
-                  when "UserCustomField"
+                  end
-                    @custom_field = UserCustomField.new(params[:custom_field])
+                rescue
-                  when "ProjectCustomField"
+                end
-                    @custom_field = ProjectCustomField.new(params[:custom_field])
+                redirect_to(:action => 'list') and return unless @custom_field.is_a?(CustomField)
-                  when "TimeEntryCustomField"
-                    @custom_field = TimeEntryCustomField.new(params[:custom_field])
-                  else
-                    redirect_to :action => 'list'
-                    return
-                end
                 if request.post? and @custom_field.save
                   flash[:notice] = l(:notice_successful_create)
                   redirect_to :action => 'list', :tab => @custom_field.class.name
                 end
                 @trackers = Tracker.find(:all, :order => 'position')
               end
               def edit
                 @custom_field = CustomField.find(params[:id])
                 if request.post? and @custom_field.update_attributes(params[:custom_field])
                   flash[:notice] = l(:notice_successful_update)
                   redirect_to :action => 'list', :tab => @custom_field.class.name
                 end
                 @trackers = Tracker.find(:all, :order => 'position')
               end
               def move
                 @custom_field = CustomField.find(params[:id])
                 case params[:position]
                 when 'highest'
                   @custom_field.move_to_top
                 when 'higher'
                   @custom_field.move_higher
                 when 'lower'
                   @custom_field.move_lower
                 when 'lowest'
                   @custom_field.move_to_bottom
                 end if params[:position]
                 redirect_to :action => 'list', :tab => @custom_field.class.name
               end
               def destroy
                 @custom_field = CustomField.find(params[:id]).destroy
                 redirect_to :action => 'list', :tab => @custom_field.class.name
               rescue
                 flash[:error] = "Unable to delete custom field"
                 redirect_to :action => 'list'
               end
             end

test/functional/custom_fields_controller_test.rb +6 -1

             # Redmine - project management software
             # Copyright (C) 2006-2009  Jean-Philippe Lang
             #
             # This program is free software; you can redistribute it and/or
             # modify it under the terms of the GNU General Public License
             # as published by the Free Software Foundation; either version 2
             # of the License, or (at your option) any later version.
             #
             # This program is distributed in the hope that it will be useful,
             # but WITHOUT ANY WARRANTY; without even the implied warranty of
             # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
             # GNU General Public License for more details.
             #
             # You should have received a copy of the GNU General Public License
             # along with this program; if not, write to the Free Software
             # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             require File.dirname(__FILE__) + '/../test_helper'
             require 'custom_fields_controller'
             # Re-raise errors caught by the controller.
             class CustomFieldsController; def rescue_action(e) raise e end; end
             class CustomFieldsControllerTest < Test::Unit::TestCase
-              fixtures :custom_fields, :trackers
+              fixtures :custom_fields, :trackers, :users
               def setup
                 @controller = CustomFieldsController.new
                 @request    = ActionController::TestRequest.new
                 @response   = ActionController::TestResponse.new
                 @request.session[:user_id] = 1
               end
               def test_post_new_list_custom_field
                 assert_difference 'CustomField.count' do
                   post :new, :type => "IssueCustomField",
                              :custom_field => {:name => "test_post_new_list",
                                                :default_value => "",
                                                :min_length => "0",
                                                :searchable => "0",
                                                :regexp => "",
                                                :is_for_all => "1",
                                                :possible_values => "0.1\n0.2\n",
                                                :max_length => "0",
                                                :is_filter => "0",
                                                :is_required =>"0",
                                                :field_format => "list",
                                                :tracker_ids => ["1", ""]}
                 end
                 assert_redirected_to '/custom_fields/list'
                 field = IssueCustomField.find_by_name('test_post_new_list')
                 assert_not_nil field
                 assert_equal ["0.1", "0.2"], field.possible_values
                 assert_equal 1, field.trackers.size
               end
+              def test_invalid_custom_field_class_should_redirect_to_list
+                get :new, :type => 'UnknownCustomField'
+                assert_redirected_to '/custom_fields/list'
+              end
             end

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages