jro_apps/redmine Commit - r5152:1cd6a2aa84db

Adds User and Version custom field format that can be used to reference a project member or version in custom fields (#2096)....

Jean-Philippe Lang -

r5152:1cd6a2aa84db

parent child

Context file:

r5152:1cd6a2aa84db

Collapse all files

test/unit/custom_field_user_format_test.rb created 644 +65 0

@@ -0,0 +1,65
	1	# Redmine - project management software
	2	# Copyright (C) 2006-2011 Jean-Philippe Lang
	3	#
	4	# This program is free software; you can redistribute it and/or
	5	# modify it under the terms of the GNU General Public License
	6	# as published by the Free Software Foundation; either version 2
	7	# of the License, or (at your option) any later version.
	8	#
	9	# This program is distributed in the hope that it will be useful,
	10	# but WITHOUT ANY WARRANTY; without even the implied warranty of
	11	# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	12	# GNU General Public License for more details.
	13	#
	14	# You should have received a copy of the GNU General Public License
	15	# along with this program; if not, write to the Free Software
	16	# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
	17
	18	require File.expand_path('../../test_helper', __FILE__)
	19
	20	class CustomFieldUserFormatTest < ActiveSupport::TestCase
	21	fixtures :custom_fields, :projects, :members, :users, :member_roles, :trackers, :issues
	22
	23	def setup
	24	@field = IssueCustomField.create!(:name => 'Tester', :field_format => 'user')
	25	end
	26
	27	def test_possible_values_with_no_arguments
	28	assert_equal [], @field.possible_values
	29	assert_equal [], @field.possible_values(nil)
	30	end
	31
	32	def test_possible_values_with_project_resource
	33	project = Project.find(1)
	34	possible_values = @field.possible_values(project.issues.first)
	35	assert possible_values.any?
	36	assert_equal project.users.sort.collect(&:id).map(&:to_s), possible_values
	37	end
	38
	39	def test_possible_values_options_with_no_arguments
	40	assert_equal [], @field.possible_values_options
	41	assert_equal [], @field.possible_values_options(nil)
	42	end
	43
	44	def test_possible_values_options_with_project_resource
	45	project = Project.find(1)
	46	possible_values_options = @field.possible_values_options(project.issues.first)
	47	assert possible_values_options.any?
	48	assert_equal project.users.sort.map {\|u\| [u.name, u.id.to_s]}, possible_values_options
	49	end
	50
	51	def test_cast_blank_value
	52	assert_equal nil, @field.cast_value(nil)
	53	assert_equal nil, @field.cast_value("")
	54	end
	55
	56	def test_cast_valid_value
	57	user = @field.cast_value("2")
	58	assert_kind_of User, user
	59	assert_equal User.find(2), user
	60	end
	61
	62	def test_cast_invalid_value
	63	assert_equal nil, @field.cast_value("187")
	64	end
	65	end

app/helpers/custom_fields_helper.rb +4 -4

                   blank_option = custom_field.is_required? ?
                                    (custom_field.default_value.blank? ? "<option value=\"\">--- #{l(:actionview_instancetag_blank_option)} ---</option>" : '') :
                                    '<option></option>'
-                  select_tag(field_name, blank_option + options_for_select(custom_field.possible_values, custom_value.value), :id => field_id)
+                  select_tag(field_name, blank_option + options_for_select(custom_field.possible_values_options(custom_value.customized), custom_value.value), :id => field_id)
                 else
                   text_field_tag(field_name, custom_value.value, :id => field_id)
                 end
                                                                [l(:general_text_yes), '1'],
                                                                [l(:general_text_no), '0']]), :id => field_id)
                   when "list"
-                    select_tag(field_name, options_for_select([[l(:label_no_change_option), '']] + custom_field.possible_values), :id => field_id)
+                    select_tag(field_name, options_for_select([[l(:label_no_change_option), '']] + custom_field.possible_values_options), :id => field_id)
                   else
                     text_field_tag(field_name, '', :id => field_id)
                 end
               end
               # Return an array of custom field formats which can be used in select_tag
-              def custom_field_formats_for_select
+              def custom_field_formats_for_select(custom_field)
-                Redmine::CustomFieldFormat.as_select
+                Redmine::CustomFieldFormat.as_select(custom_field.class.customized_class.name)
               end
               # Renders the custom_values in api views

app/models/custom_field.rb +31 -2

@@ -1,5 +1,5
1	# ~~redM~~ine - project management software	1	# Redmine - project management software
2	# Copyright (C) 2006 Jean-Philippe Lang	2	# Copyright (C) 2006-2011 Jean-Philippe Lang
3	#	3	#
4	# This program is free software; you can redistribute it and/or	4	# This program is free software; you can redistribute it and/or
5	# modify it under the terms of the GNU General Public License	5	# modify it under the terms of the GNU General Public License
@@ -48,6 +48,33 class CustomField < ActiveRecord::Base
48	errors.add(:default_value, :invalid) unless v.valid?	48	errors.add(:default_value, :invalid) unless v.valid?
49	end	49	end
50		50
		51	def possible_values_options(obj=nil)
		52	case field_format
		53	when 'user', 'version'
		54	if obj.respond_to?(:project)
		55	case field_format
		56	when 'user'
		57	obj.project.users.sort.collect {\|u\| [u.to_s, u.id.to_s]}
		58	when 'version'
		59	obj.project.versions.sort.collect {\|u\| [u.to_s, u.id.to_s]}
		60	end
		61	else
		62	[]
		63	end
		64	else
		65	read_attribute :possible_values
		66	end
		67	end
		68
		69	def possible_values(obj=nil)
		70	case field_format
		71	when 'user'
		72	possible_values_options(obj).collect(&:last)
		73	else
		74	read_attribute :possible_values
		75	end
		76	end
		77
51	# Makes possible_values accept a multiline string	78	# Makes possible_values accept a multiline string
52	def possible_values=(arg)	79	def possible_values=(arg)
53	if arg.is_a?(Array)	80	if arg.is_a?(Array)
@@ -71,6 +98,8 class CustomField < ActiveRecord::Base
71	casted = value.to_i	98	casted = value.to_i
72	when 'float'	99	when 'float'
73	casted = value.to_f	100	casted = value.to_f
		101	when 'user', 'version'
		102	casted = (value.blank? ? nil : field_format.classify.constantize.find_by_id(value.to_i))
74	end	103	end
75	end	104	end
76	casted	105	casted

app/models/query.rb +4 -1

             # Redmine - project management software
-            # Copyright (C) 2006-2008  Jean-Philippe Lang
+            # Copyright (C) 2006-2011  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
                     options = { :type => :date, :order => 20 }
                   when "bool"
                     options = { :type => :list, :values => [[l(:general_text_yes), "1"], [l(:general_text_no), "0"]], :order => 20 }
+                  when "user", "version"
+                    next unless project
+                    options = { :type => :list_optional, :values => field.possible_values_options(project), :order => 20}
                   else
                     options = { :type => :string, :order => 20 }
                   end

app/views/custom_fields/_form.rhtml +9 -1

                   if (p_searchable) Element.hide(p_searchable.parentNode);
                   Element.hide(p_values.parentNode);
                   break;
+            		case "user":
+                case "version":
+                  Element.hide(p_length.parentNode);
+                  Element.hide(p_regexp.parentNode);
+                  if (p_searchable) Element.hide(p_searchable.parentNode);
+                  Element.hide(p_values.parentNode);
+                  Element.hide(p_default.parentNode);
+            		  break;
                 default:
                   Element.show(p_length.parentNode);
                   Element.show(p_regexp.parentNode);
             <div class="box">
             <p><%= f.text_field :name, :required => true %></p>
-            <p><%= f.select :field_format, custom_field_formats_for_select, {}, :onchange => "toggle_custom_field_format();",
+            <p><%= f.select :field_format, custom_field_formats_for_select(@custom_field), {}, :onchange => "toggle_custom_field_format();",
             																																		:disabled => !@custom_field.new_record? %></p>
             <p><label for="custom_field_min_length"><%=l(:label_min_max_length)%></label>
                <%= f.text_field :min_length, :size => 5, :no_label => true %> -

lib/redmine.rb +2 0

               fields.register Redmine::CustomFieldFormat.new('list', :label => :label_list, :order => 5)
               fields.register Redmine::CustomFieldFormat.new('date', :label => :label_date, :order => 6)
               fields.register Redmine::CustomFieldFormat.new('bool', :label => :label_boolean, :order => 7)
+              fields.register Redmine::CustomFieldFormat.new('user', :label => :label_user, :only => %w(Issue TimeEntry Version Project), :edit_as => 'list', :order => 8)
+              fields.register Redmine::CustomFieldFormat.new('version', :label => :label_version, :only => %w(Issue TimeEntry Version Project), :edit_as => 'list', :order => 9)
             end
             # Permissions

lib/redmine/custom_field_format.rb +12 -9

                 cattr_accessor :available
                 @@available = {}
-                attr_accessor :name, :order, :label
+                attr_accessor :name, :order, :label, :edit_as, :class_names
                 def initialize(name, options={})
                   self.name = name
                   self.label = options[:label]
                   self.order = options[:order]
+                  self.edit_as = options[:edit_as] || name
+                  self.class_names = options[:only]
                 end
                 def format(value)
                     return value
                   }
                 end
-                # Allow displaying the edit type of another field_format
+                ['user', 'version'].each do |name|
+                  define_method("format_as_#{name}") {|value|
-                # Example: display a custom field as a list
+                    return value.blank? ? "" : name.classify.constantize.find_by_id(value.to_i).to_s
-                def edit_as
-                  name
                 end
                 class << self
                   end
                   # Return an array of custom field formats which can be used in select_tag
-                  def as_select
+                  def as_select(class_name=nil)
-                    @@available.values.sort {|a,b|
+                    fields = @@available.values
+                    fields = fields.select {|field| field.class_names.nil? || field.class_names.include?(class_name)}
+                    fields.sort {|a,b|
                       a.order <=> b.order
                     }.collect {|custom_field_format|
                       [ l(custom_field_format.label), custom_field_format.name ]

test/functional/custom_fields_controller_test.rb +26 -6

@@ -1,5 +1,5
1	# Redmine - project management software	1	# Redmine - project management software
2	# Copyright (C) 2006-2009 Jean-Philippe Lang	2	# Copyright (C) 2006-2011 Jean-Philippe Lang
3	#	3	#
4	# This program is free software; you can redistribute it and/or	4	# This program is free software; you can redistribute it and/or
5	# modify it under the terms of the GNU General Public License	5	# modify it under the terms of the GNU General Public License
@@ -31,6 +31,31 class CustomFieldsControllerTest < ActionController::TestCase
31	@request.session[:user_id] = 1	31	@request.session[:user_id] = 1
32	end	32	end
33		33
		34	def test_get_new_issue_custom_field
		35	get :new, :type => 'IssueCustomField'
		36	assert_response :success
		37	assert_template 'new'
		38	assert_tag :select,
		39	:attributes => {:name => 'custom_field[field_format]'},
		40	:child => {
		41	:tag => 'option',
		42	:attributes => {:value => 'user'},
		43	:content => 'User'
		44	}
		45	assert_tag :select,
		46	:attributes => {:name => 'custom_field[field_format]'},
		47	:child => {
		48	:tag => 'option',
		49	:attributes => {:value => 'version'},
		50	:content => 'Version'
		51	}
		52	end
		53
		54	def test_get_new_with_invalid_custom_field_class_should_redirect_to_list
		55	get :new, :type => 'UnknownCustomField'
		56	assert_redirected_to '/custom_fields'
		57	end
		58
34	def test_post_new_list_custom_field	59	def test_post_new_list_custom_field
35	assert_difference 'CustomField.count' do	60	assert_difference 'CustomField.count' do
36	post :new, :type => "IssueCustomField",	61	post :new, :type => "IssueCustomField",
@@ -53,9 +78,4 class CustomFieldsControllerTest < ActionController::TestCase
53	assert_equal ["0.1", "0.2"], field.possible_values	78	assert_equal ["0.1", "0.2"], field.possible_values
54	assert_equal 1, field.trackers.size	79	assert_equal 1, field.trackers.size
55	end	80	end
56
57	def test_invalid_custom_field_class_should_redirect_to_list
58	get :new, :type => 'UnknownCustomField'
59	assert_redirected_to '/custom_fields'
60	end
61	end	81	end

test/integration/issues_test.rb +73 -2

@@ -1,5 +1,5
1	# ~~redM~~ine - project management software	1	# Redmine - project management software
2	# Copyright (C) 2006-2008 Jean-Philippe Lang	2	# Copyright (C) 2006-2011 Jean-Philippe Lang
3	#	3	#
4	# This program is free software; you can redistribute it and/or	4	# This program is free software; you can redistribute it and/or
5	# modify it under the terms of the GNU General Public License	5	# modify it under the terms of the GNU General Public License
@@ -126,4 +126,75 class IssuesTest < ActionController::IntegrationTest
126	:attributes => { :href => '/projects/ecookbook/issues?page=2' }	126	:attributes => { :href => '/projects/ecookbook/issues?page=2' }
127		127
128	end	128	end
		129
		130	def test_issue_with_user_custom_field
		131	@field = IssueCustomField.create!(:name => 'Tester', :field_format => 'user', :is_for_all => true, :trackers => Tracker.all)
		132	Role.anonymous.add_permission! :add_issues, :edit_issues
		133	users = Project.find(1).users
		134	tester = users.first
		135
		136	# Issue form
		137	get '/projects/ecookbook/issues/new'
		138	assert_response :success
		139	assert_tag :select,
		140	:attributes => {:name => "issue[custom_field_values][#{@field.id}]"},
		141	:children => {:count => (users.size + 1)}, # +1 for blank value
		142	:child => {
		143	:tag => 'option',
		144	:attributes => {:value => tester.id.to_s},
		145	:content => tester.name
		146	}
		147
		148	# Create issue
		149	assert_difference 'Issue.count' do
		150	post '/projects/ecookbook/issues',
		151	:issue => {
		152	:tracker_id => '1',
		153	:priority_id => '4',
		154	:subject => 'Issue with user custom field',
		155	:custom_field_values => {@field.id.to_s => users.first.id.to_s}
		156	}
		157	end
		158	issue = Issue.first(:order => 'id DESC')
		159	assert_response 302
		160
		161	# Issue view
		162	follow_redirect!
		163	assert_tag :th,
		164	:content => /Tester/,
		165	:sibling => {
		166	:tag => 'td',
		167	:content => tester.name
		168	}
		169	assert_tag :select,
		170	:attributes => {:name => "issue[custom_field_values][#{@field.id}]"},
		171	:children => {:count => (users.size + 1)}, # +1 for blank value
		172	:child => {
		173	:tag => 'option',
		174	:attributes => {:value => tester.id.to_s, :selected => 'selected'},
		175	:content => tester.name
		176	}
		177
		178	# Update issue
		179	new_tester = users[1]
		180	assert_difference 'Journal.count' do
		181	put "/issues/#{issue.id}",
		182	:notes => 'Updating custom field',
		183	:issue => {
		184	:custom_field_values => {@field.id.to_s => new_tester.id.to_s}
		185	}
		186	end
		187	assert_response 302
		188
		189	# Issue view
		190	follow_redirect!
		191	assert_tag :content => 'Tester',
		192	:ancestor => {:tag => 'ul', :attributes => {:class => /details/}},
		193	:sibling => {
		194	:content => tester.name,
		195	:sibling => {
		196	:content => new_tester.name
		197	}
		198	}
		199	end
129	end	200	end

vendor/plugins/acts_as_customizable/lib/acts_as_customizable.rb +3 -3

-            # redMine - project management software
+            # Redmine - project management software
-            # Copyright (C) 2006-2008  Jean-Philippe Lang
+            # Copyright (C) 2006-2011  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
                     end
                     def custom_field_values
-                      @custom_field_values ||= available_custom_fields.collect { |x| custom_values.detect { |v| v.custom_field == x } || custom_values.build(:custom_field => x, :value => nil) }
+                      @custom_field_values ||= available_custom_fields.collect { |x| custom_values.detect { |v| v.custom_field == x } || custom_values.build(:customized => self, :custom_field => x, :value => nil) }
                     end
                     def visible_custom_field_values

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