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

             # Redmine - project management software
             # 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
             # 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.
             module CustomFieldsHelper
               def custom_fields_tabs
                 tabs = [{:name => 'IssueCustomField', :partial => 'custom_fields/index', :label => :label_issue_plural},
                         {:name => 'TimeEntryCustomField', :partial => 'custom_fields/index', :label => :label_spent_time},
                         {:name => 'ProjectCustomField', :partial => 'custom_fields/index', :label => :label_project_plural},
                         {:name => 'VersionCustomField', :partial => 'custom_fields/index', :label => :label_version_plural},
                         {:name => 'UserCustomField', :partial => 'custom_fields/index', :label => :label_user_plural},
                         {:name => 'GroupCustomField', :partial => 'custom_fields/index', :label => :label_group_plural},
                         {:name => 'TimeEntryActivityCustomField', :partial => 'custom_fields/index', :label => TimeEntryActivity::OptionName},
                         {:name => 'IssuePriorityCustomField', :partial => 'custom_fields/index', :label => IssuePriority::OptionName},
                         {:name => 'DocumentCategoryCustomField', :partial => 'custom_fields/index', :label => DocumentCategory::OptionName}
                         ]
               end
               # Return custom field html tag corresponding to its format
               def custom_field_tag(name, custom_value)
                 custom_field = custom_value.custom_field
                 field_name = "#{name}[custom_field_values][#{custom_field.id}]"
                 field_id = "#{name}_custom_field_values_#{custom_field.id}"
                 field_format = Redmine::CustomFieldFormat.find_by_name(custom_field.field_format)
                 case field_format.try(:edit_as)
                 when "date"
                   text_field_tag(field_name, custom_value.value, :id => field_id, :size => 10) +
                   calendar_for(field_id)
                 when "text"
                   text_area_tag(field_name, custom_value.value, :id => field_id, :rows => 3, :style => 'width:90%')
                 when "bool"
                   hidden_field_tag(field_name, '0') + check_box_tag(field_name, '1', custom_value.true?, :id => field_id)
                 when "list"
                   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
               end
               # Return custom field label tag
               def custom_field_label_tag(name, custom_value)
                 content_tag "label", custom_value.custom_field.name +
             	(custom_value.custom_field.is_required? ? " <span class=\"required\">*</span>" : ""),
             	:for => "#{name}_custom_field_values_#{custom_value.custom_field.id}",
             	:class => (custom_value.errors.empty? ? nil : "error" )
               end
               # Return custom field tag with its label tag
               def custom_field_tag_with_label(name, custom_value)
                 custom_field_label_tag(name, custom_value) + custom_field_tag(name, custom_value)
               end
               def custom_field_tag_for_bulk_edit(name, custom_field)
                 field_name = "#{name}[custom_field_values][#{custom_field.id}]"
                 field_id = "#{name}_custom_field_values_#{custom_field.id}"
                 field_format = Redmine::CustomFieldFormat.find_by_name(custom_field.field_format)
                 case field_format.try(:edit_as)
                   when "date"
                     text_field_tag(field_name, '', :id => field_id, :size => 10) +
                     calendar_for(field_id)
                   when "text"
                     text_area_tag(field_name, '', :id => field_id, :rows => 3, :style => 'width:90%')
                   when "bool"
                     select_tag(field_name, options_for_select([[l(:label_no_change_option), ''],
                                                                [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 a string used to display a custom value
               def show_value(custom_value)
                 return "" unless custom_value
                 format_value(custom_value.value, custom_value.custom_field.field_format)
               end
               # Return a string used to display a custom value
               def format_value(value, field_format)
                 Redmine::CustomFieldFormat.format_value(value, field_format) # Proxy
               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
               def render_api_custom_values(custom_values, api)
                 api.array :custom_fields do
                   custom_values.each do |custom_value|
                     api.custom_field :id => custom_value.custom_field_id, :name => custom_value.custom_field.name do
                       api.value custom_value.value
                     end
                   end
                 end unless custom_values.empty?
               end
             end

app/models/custom_field.rb +31 -2

-            # redMine - project management software
+            # Redmine - project management software
-            # Copyright (C) 2006  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
             # 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 CustomField < ActiveRecord::Base
               has_many :custom_values, :dependent => :delete_all
               acts_as_list :scope => 'type = \'#{self.class}\''
               serialize :possible_values
               validates_presence_of :name, :field_format
               validates_uniqueness_of :name, :scope => :type
               validates_length_of :name, :maximum => 30
               validates_inclusion_of :field_format, :in => Redmine::CustomFieldFormat.available_formats
               def initialize(attributes = nil)
                 super
                 self.possible_values ||= []
               end
               def before_validation
                 # make sure these fields are not searchable
                 self.searchable = false if %w(int float date bool).include?(field_format)
                 true
               end
               def validate
                 if self.field_format == "list"
                   errors.add(:possible_values, :blank) if self.possible_values.nil? || self.possible_values.empty?
                   errors.add(:possible_values, :invalid) unless self.possible_values.is_a? Array
                 end
                 # validate default value
                 v = CustomValue.new(:custom_field => self.clone, :value => default_value, :customized => nil)
                 v.custom_field.is_required = false
                 errors.add(:default_value, :invalid) unless v.valid?
               end
+              def possible_values_options(obj=nil)
+                case field_format
+                when 'user', 'version'
+                  if obj.respond_to?(:project)
+                    case field_format
+                    when 'user'
+                      obj.project.users.sort.collect {|u| [u.to_s, u.id.to_s]}
+                    when 'version'
+                      obj.project.versions.sort.collect {|u| [u.to_s, u.id.to_s]}
+                    end
+                  else
+                    []
+                  end
+                else
+                  read_attribute :possible_values
+                end
+              end
+              def possible_values(obj=nil)
+                case field_format
+                when 'user'
+                  possible_values_options(obj).collect(&:last)
+                else
+                  read_attribute :possible_values
+                end
+              end
               # Makes possible_values accept a multiline string
               def possible_values=(arg)
                 if arg.is_a?(Array)
                   write_attribute(:possible_values, arg.compact.collect(&:strip).select {|v| !v.blank?})
                 else
                   self.possible_values = arg.to_s.split(/[\n\r]+/)
                 end
               end
               def cast_value(value)
                 casted = nil
                 unless value.blank?
                   case field_format
                   when 'string', 'text', 'list'
                     casted = value
                   when 'date'
                     casted = begin; value.to_date; rescue; nil end
                   when 'bool'
                     casted = (value == '1' ? true : false)
                   when 'int'
                     casted = value.to_i
                   when 'float'
                     casted = value.to_f
+                  when 'user', 'version'
+                    casted = (value.blank? ? nil : field_format.classify.constantize.find_by_id(value.to_i))
                   end
                 end
                 casted
               end
               # Returns a ORDER BY clause that can used to sort customized
               # objects by their value of the custom field.
               # Returns false, if the custom field can not be used for sorting.
               def order_statement
                 case field_format
                   when 'string', 'text', 'list', 'date', 'bool'
                     # COALESCE is here to make sure that blank and NULL values are sorted equally
                     "COALESCE((SELECT cv_sort.value FROM #{CustomValue.table_name} cv_sort" +
                       " WHERE cv_sort.customized_type='#{self.class.customized_class.name}'" +
                       " AND cv_sort.customized_id=#{self.class.customized_class.table_name}.id" +
                       " AND cv_sort.custom_field_id=#{id} LIMIT 1), '')"
                   when 'int', 'float'
                     # Make the database cast values into numeric
                     # Postgresql will raise an error if a value can not be casted!
                     # CustomValue validations should ensure that it doesn't occur
                     "(SELECT CAST(cv_sort.value AS decimal(60,3)) FROM #{CustomValue.table_name} cv_sort" +
                       " WHERE cv_sort.customized_type='#{self.class.customized_class.name}'" +
                       " AND cv_sort.customized_id=#{self.class.customized_class.table_name}.id" +
                       " AND cv_sort.custom_field_id=#{id} AND cv_sort.value <> '' AND cv_sort.value IS NOT NULL LIMIT 1)"
                   else
                     nil
                 end
               end
               def <=>(field)
                 position <=> field.position
               end
               def self.customized_class
                 self.name =~ /^(.+)CustomField$/
                 begin; $1.constantize; rescue nil; end
               end
               # to move in project_custom_field
               def self.for_all
                 find(:all, :conditions => ["is_for_all=?", true], :order => 'position')
               end
               def type_name
                 nil
               end
             end

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
             # 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 QueryColumn
               attr_accessor :name, :sortable, :groupable, :default_order
               include Redmine::I18n
               def initialize(name, options={})
                 self.name = name
                 self.sortable = options[:sortable]
                 self.groupable = options[:groupable] || false
                 if groupable == true
                   self.groupable = name.to_s
                 end
                 self.default_order = options[:default_order]
                 @caption_key = options[:caption] || "field_#{name}"
               end
               def caption
                 l(@caption_key)
               end
               # Returns true if the column is sortable, otherwise false
               def sortable?
                 !sortable.nil?
               end
               def value(issue)
                 issue.send name
               end
             end
             class QueryCustomFieldColumn < QueryColumn
               def initialize(custom_field)
                 self.name = "cf_#{custom_field.id}".to_sym
                 self.sortable = custom_field.order_statement || false
                 if %w(list date bool int).include?(custom_field.field_format)
                   self.groupable = custom_field.order_statement
                 end
                 self.groupable ||= false
                 @cf = custom_field
               end
               def caption
                 @cf.name
               end
               def custom_field
                 @cf
               end
               def value(issue)
                 cv = issue.custom_values.detect {|v| v.custom_field_id == @cf.id}
                 cv && @cf.cast_value(cv.value)
               end
             end
             class Query < ActiveRecord::Base
               class StatementInvalid < ::ActiveRecord::StatementInvalid
               end
               belongs_to :project
               belongs_to :user
               serialize :filters
               serialize :column_names
               serialize :sort_criteria, Array
               attr_protected :project_id, :user_id
               validates_presence_of :name, :on => :save
               validates_length_of :name, :maximum => 255
               @@operators = { "="   => :label_equals,
                               "!"   => :label_not_equals,
                               "o"   => :label_open_issues,
                               "c"   => :label_closed_issues,
                               "!*"  => :label_none,
                               "*"   => :label_all,
                               ">="  => :label_greater_or_equal,
                               "<="  => :label_less_or_equal,
                               "<t+" => :label_in_less_than,
                               ">t+" => :label_in_more_than,
                               "t+"  => :label_in,
                               "t"   => :label_today,
                               "w"   => :label_this_week,
                               ">t-" => :label_less_than_ago,
                               "<t-" => :label_more_than_ago,
                               "t-"  => :label_ago,
                               "~"   => :label_contains,
                               "!~"  => :label_not_contains }
               cattr_reader :operators
               @@operators_by_filter_type = { :list => [ "=", "!" ],
                                              :list_status => [ "o", "=", "!", "c", "*" ],
                                              :list_optional => [ "=", "!", "!*", "*" ],
                                              :list_subprojects => [ "*", "!*", "=" ],
                                              :date => [ "<t+", ">t+", "t+", "t", "w", ">t-", "<t-", "t-" ],
                                              :date_past => [ ">t-", "<t-", "t-", "t", "w" ],
                                              :string => [ "=", "~", "!", "!~" ],
                                              :text => [  "~", "!~" ],
                                              :integer => [ "=", ">=", "<=", "!*", "*" ] }
               cattr_reader :operators_by_filter_type
               @@available_columns = [
                 QueryColumn.new(:project, :sortable => "#{Project.table_name}.name", :groupable => true),
                 QueryColumn.new(:tracker, :sortable => "#{Tracker.table_name}.position", :groupable => true),
                 QueryColumn.new(:parent, :sortable => ["#{Issue.table_name}.root_id", "#{Issue.table_name}.lft ASC"], :default_order => 'desc', :caption => :field_parent_issue),
                 QueryColumn.new(:status, :sortable => "#{IssueStatus.table_name}.position", :groupable => true),
                 QueryColumn.new(:priority, :sortable => "#{IssuePriority.table_name}.position", :default_order => 'desc', :groupable => true),
                 QueryColumn.new(:subject, :sortable => "#{Issue.table_name}.subject"),
                 QueryColumn.new(:author),
                 QueryColumn.new(:assigned_to, :sortable => ["#{User.table_name}.lastname", "#{User.table_name}.firstname", "#{User.table_name}.id"], :groupable => true),
                 QueryColumn.new(:updated_on, :sortable => "#{Issue.table_name}.updated_on", :default_order => 'desc'),
                 QueryColumn.new(:category, :sortable => "#{IssueCategory.table_name}.name", :groupable => true),
                 QueryColumn.new(:fixed_version, :sortable => ["#{Version.table_name}.effective_date", "#{Version.table_name}.name"], :default_order => 'desc', :groupable => true),
                 QueryColumn.new(:start_date, :sortable => "#{Issue.table_name}.start_date"),
                 QueryColumn.new(:due_date, :sortable => "#{Issue.table_name}.due_date"),
                 QueryColumn.new(:estimated_hours, :sortable => "#{Issue.table_name}.estimated_hours"),
                 QueryColumn.new(:done_ratio, :sortable => "#{Issue.table_name}.done_ratio", :groupable => true),
                 QueryColumn.new(:created_on, :sortable => "#{Issue.table_name}.created_on", :default_order => 'desc'),
               ]
               cattr_reader :available_columns
               def initialize(attributes = nil)
                 super attributes
                 self.filters ||= { 'status_id' => {:operator => "o", :values => [""]} }
               end
               def after_initialize
                 # Store the fact that project is nil (used in #editable_by?)
                 @is_for_all = project.nil?
               end
               def validate
                 filters.each_key do |field|
                   errors.add label_for(field), :blank unless
                       # filter requires one or more values
                       (values_for(field) and !values_for(field).first.blank?) or
                       # filter doesn't require any value
                       ["o", "c", "!*", "*", "t", "w"].include? operator_for(field)
                 end if filters
               end
               def editable_by?(user)
                 return false unless user
                 # Admin can edit them all and regular users can edit their private queries
                 return true if user.admin? || (!is_public && self.user_id == user.id)
                 # Members can not edit public queries that are for all project (only admin is allowed to)
                 is_public && !@is_for_all && user.allowed_to?(:manage_public_queries, project)
               end
               def available_filters
                 return @available_filters if @available_filters
                 trackers = project.nil? ? Tracker.find(:all, :order => 'position') : project.rolled_up_trackers
                 @available_filters = { "status_id" => { :type => :list_status, :order => 1, :values => IssueStatus.find(:all, :order => 'position').collect{|s| [s.name, s.id.to_s] } },
                                        "tracker_id" => { :type => :list, :order => 2, :values => trackers.collect{|s| [s.name, s.id.to_s] } },
                                        "priority_id" => { :type => :list, :order => 3, :values => IssuePriority.all.collect{|s| [s.name, s.id.to_s] } },
                                        "subject" => { :type => :text, :order => 8 },
                                        "created_on" => { :type => :date_past, :order => 9 },
                                        "updated_on" => { :type => :date_past, :order => 10 },
                                        "start_date" => { :type => :date, :order => 11 },
                                        "due_date" => { :type => :date, :order => 12 },
                                        "estimated_hours" => { :type => :integer, :order => 13 },
                                        "done_ratio" =>  { :type => :integer, :order => 14 }}
                 user_values = []
                 user_values << ["<< #{l(:label_me)} >>", "me"] if User.current.logged?
                 if project
                   user_values += project.users.sort.collect{|s| [s.name, s.id.to_s] }
                 else
                   all_projects = Project.visible.all
                   if all_projects.any?
                     # members of visible projects
                     user_values += User.active.find(:all, :conditions => ["#{User.table_name}.id IN (SELECT DISTINCT user_id FROM members WHERE project_id IN (?))", all_projects.collect(&:id)]).sort.collect{|s| [s.name, s.id.to_s] }
                     # project filter
                     project_values = []
                     Project.project_tree(all_projects) do |p, level|
                       prefix = (level > 0 ? ('--' * level + ' ') : '')
                       project_values << ["#{prefix}#{p.name}", p.id.to_s]
                     end
                     @available_filters["project_id"] = { :type => :list, :order => 1, :values => project_values} unless project_values.empty?
                   end
                 end
                 @available_filters["assigned_to_id"] = { :type => :list_optional, :order => 4, :values => user_values } unless user_values.empty?
                 @available_filters["author_id"] = { :type => :list, :order => 5, :values => user_values } unless user_values.empty?
                 group_values = Group.all.collect {|g| [g.name, g.id.to_s] }
                 @available_filters["member_of_group"] = { :type => :list_optional, :order => 6, :values => group_values } unless group_values.empty?
                 role_values = Role.givable.collect {|r| [r.name, r.id.to_s] }
                 @available_filters["assigned_to_role"] = { :type => :list_optional, :order => 7, :values => role_values } unless role_values.empty?
                 if User.current.logged?
                   @available_filters["watcher_id"] = { :type => :list, :order => 15, :values => [["<< #{l(:label_me)} >>", "me"]] }
                 end
                 if project
                   # project specific filters
                   unless @project.issue_categories.empty?
                     @available_filters["category_id"] = { :type => :list_optional, :order => 6, :values => @project.issue_categories.collect{|s| [s.name, s.id.to_s] } }
                   end
                   unless @project.shared_versions.empty?
                     @available_filters["fixed_version_id"] = { :type => :list_optional, :order => 7, :values => @project.shared_versions.sort.collect{|s| ["#{s.project.name} - #{s.name}", s.id.to_s] } }
                   end
                   unless @project.descendants.active.empty?
                     @available_filters["subproject_id"] = { :type => :list_subprojects, :order => 13, :values => @project.descendants.visible.collect{|s| [s.name, s.id.to_s] } }
                   end
                   add_custom_fields_filters(@project.all_issue_custom_fields)
                 else
                   # global filters for cross project issue list
                   system_shared_versions = Version.visible.find_all_by_sharing('system')
                   unless system_shared_versions.empty?
                     @available_filters["fixed_version_id"] = { :type => :list_optional, :order => 7, :values => system_shared_versions.sort.collect{|s| ["#{s.project.name} - #{s.name}", s.id.to_s] } }
                   end
                   add_custom_fields_filters(IssueCustomField.find(:all, :conditions => {:is_filter => true, :is_for_all => true}))
                 end
                 @available_filters
               end
               def add_filter(field, operator, values)
                 # values must be an array
                 return unless values and values.is_a? Array # and !values.first.empty?
                 # check if field is defined as an available filter
                 if available_filters.has_key? field
                   filter_options = available_filters[field]
                   # check if operator is allowed for that filter
                   #if @@operators_by_filter_type[filter_options[:type]].include? operator
                   #  allowed_values = values & ([""] + (filter_options[:values] || []).collect {|val| val[1]})
                   #  filters[field] = {:operator => operator, :values => allowed_values } if (allowed_values.first and !allowed_values.first.empty?) or ["o", "c", "!*", "*", "t"].include? operator
                   #end
                   filters[field] = {:operator => operator, :values => values }
                 end
               end
               def add_short_filter(field, expression)
                 return unless expression
                 parms = expression.scan(/^(o|c|!\*|!|\*)?(.*)$/).first
                 add_filter field, (parms[0] || "="), [parms[1] || ""]
               end
               # Add multiple filters using +add_filter+
               def add_filters(fields, operators, values)
                 if fields.is_a?(Array) && operators.is_a?(Hash) && values.is_a?(Hash)
                   fields.each do |field|
                     add_filter(field, operators[field], values[field])
                   end
                 end
               end
               def has_filter?(field)
                 filters and filters[field]
               end
               def operator_for(field)
                 has_filter?(field) ? filters[field][:operator] : nil
               end
               def values_for(field)
                 has_filter?(field) ? filters[field][:values] : nil
               end
               def label_for(field)
                 label = available_filters[field][:name] if available_filters.has_key?(field)
                 label ||= field.gsub(/\_id$/, "")
               end
               def available_columns
                 return @available_columns if @available_columns
                 @available_columns = Query.available_columns
                 @available_columns += (project ?
                                         project.all_issue_custom_fields :
                                         IssueCustomField.find(:all)
                                        ).collect {|cf| QueryCustomFieldColumn.new(cf) }
               end
               def self.available_columns=(v)
                 self.available_columns = (v)
               end
               def self.add_available_column(column)
                 self.available_columns << (column) if column.is_a?(QueryColumn)
               end
               # Returns an array of columns that can be used to group the results
               def groupable_columns
                 available_columns.select {|c| c.groupable}
               end
               # Returns a Hash of columns and the key for sorting
               def sortable_columns
                 {'id' => "#{Issue.table_name}.id"}.merge(available_columns.inject({}) {|h, column|
                                                            h[column.name.to_s] = column.sortable
                                                            h
                                                          })
               end
               def columns
                 if has_default_columns?
                   available_columns.select do |c|
                     # Adds the project column by default for cross-project lists
                     Setting.issue_list_default_columns.include?(c.name.to_s) || (c.name == :project && project.nil?)
                   end
                 else
                   # preserve the column_names order
                   column_names.collect {|name| available_columns.find {|col| col.name == name}}.compact
                 end
               end
               def column_names=(names)
                 if names
                   names = names.select {|n| n.is_a?(Symbol) || !n.blank? }
                   names = names.collect {|n| n.is_a?(Symbol) ? n : n.to_sym }
                   # Set column_names to nil if default columns
                   if names.map(&:to_s) == Setting.issue_list_default_columns
                     names = nil
                   end
                 end
                 write_attribute(:column_names, names)
               end
               def has_column?(column)
                 column_names && column_names.include?(column.name)
               end
               def has_default_columns?
                 column_names.nil? || column_names.empty?
               end
               def sort_criteria=(arg)
                 c = []
                 if arg.is_a?(Hash)
                   arg = arg.keys.sort.collect {|k| arg[k]}
                 end
                 c = arg.select {|k,o| !k.to_s.blank?}.slice(0,3).collect {|k,o| [k.to_s, o == 'desc' ? o : 'asc']}
                 write_attribute(:sort_criteria, c)
               end
               def sort_criteria
                 read_attribute(:sort_criteria) || []
               end
               def sort_criteria_key(arg)
                 sort_criteria && sort_criteria[arg] && sort_criteria[arg].first
               end
               def sort_criteria_order(arg)
                 sort_criteria && sort_criteria[arg] && sort_criteria[arg].last
               end
               # Returns the SQL sort order that should be prepended for grouping
               def group_by_sort_order
                 if grouped? && (column = group_by_column)
                   column.sortable.is_a?(Array) ?
                     column.sortable.collect {|s| "#{s} #{column.default_order}"}.join(',') :
                     "#{column.sortable} #{column.default_order}"
                 end
               end
               # Returns true if the query is a grouped query
               def grouped?
                 !group_by_column.nil?
               end
               def group_by_column
                 groupable_columns.detect {|c| c.groupable && c.name.to_s == group_by}
               end
               def group_by_statement
                 group_by_column.try(:groupable)
               end
               def project_statement
                 project_clauses = []
                 if project && !@project.descendants.active.empty?
                   ids = [project.id]
                   if has_filter?("subproject_id")
                     case operator_for("subproject_id")
                     when '='
                       # include the selected subprojects
                       ids += values_for("subproject_id").each(&:to_i)
                     when '!*'
                       # main project only
                     else
                       # all subprojects
                       ids += project.descendants.collect(&:id)
                     end
                   elsif Setting.display_subprojects_issues?
                     ids += project.descendants.collect(&:id)
                   end
                   project_clauses << "#{Project.table_name}.id IN (%s)" % ids.join(',')
                 elsif project
                   project_clauses << "#{Project.table_name}.id = %d" % project.id
                 end
                 project_clauses <<  Issue.visible_condition(User.current)
                 project_clauses.join(' AND ')
               end
               def statement
                 # filters clauses
                 filters_clauses = []
                 filters.each_key do |field|
                   next if field == "subproject_id"
                   v = values_for(field).clone
                   next unless v and !v.empty?
                   operator = operator_for(field)
                   # "me" value subsitution
                   if %w(assigned_to_id author_id watcher_id).include?(field)
                     v.push(User.current.logged? ? User.current.id.to_s : "0") if v.delete("me")
                   end
                   sql = ''
                   if field =~ /^cf_(\d+)$/
                     # custom field
                     db_table = CustomValue.table_name
                     db_field = 'value'
                     is_custom_filter = true
                     sql << "#{Issue.table_name}.id IN (SELECT #{Issue.table_name}.id FROM #{Issue.table_name} LEFT OUTER JOIN #{db_table} ON #{db_table}.customized_type='Issue' AND #{db_table}.customized_id=#{Issue.table_name}.id AND #{db_table}.custom_field_id=#{$1} WHERE "
                     sql << sql_for_field(field, operator, v, db_table, db_field, true) + ')'
                   elsif field == 'watcher_id'
                     db_table = Watcher.table_name
                     db_field = 'user_id'
                     sql << "#{Issue.table_name}.id #{ operator == '=' ? 'IN' : 'NOT IN' } (SELECT #{db_table}.watchable_id FROM #{db_table} WHERE #{db_table}.watchable_type='Issue' AND "
                     sql << sql_for_field(field, '=', v, db_table, db_field) + ')'
                   elsif field == "member_of_group" # named field
                     if operator == '*' # Any group
                       groups = Group.all
                       operator = '=' # Override the operator since we want to find by assigned_to
                     elsif operator == "!*"
                       groups = Group.all
                       operator = '!' # Override the operator since we want to find by assigned_to
                     else
                       groups = Group.find_all_by_id(v)
                     end
                     groups ||= []
                     members_of_groups = groups.inject([]) {|user_ids, group|
                       if group && group.user_ids.present?
                         user_ids << group.user_ids
                       end
                       user_ids.flatten.uniq.compact
                     }.sort.collect(&:to_s)
                     sql << '(' + sql_for_field("assigned_to_id", operator, members_of_groups, Issue.table_name, "assigned_to_id", false) + ')'
                   elsif field == "assigned_to_role" # named field
                     if operator == "*" # Any Role
                       roles = Role.givable
                       operator = '=' # Override the operator since we want to find by assigned_to
                     elsif operator == "!*" # No role
                       roles = Role.givable
                       operator = '!' # Override the operator since we want to find by assigned_to
                     else
                       roles = Role.givable.find_all_by_id(v)
                     end
                     roles ||= []
                     members_of_roles = roles.inject([]) {|user_ids, role|
                       if role && role.members
                         user_ids << role.members.collect(&:user_id)
                       end
                       user_ids.flatten.uniq.compact
                     }.sort.collect(&:to_s)
                     sql << '(' + sql_for_field("assigned_to_id", operator, members_of_roles, Issue.table_name, "assigned_to_id", false) + ')'
                   else
                     # regular field
                     db_table = Issue.table_name
                     db_field = field
                     sql << '(' + sql_for_field(field, operator, v, db_table, db_field) + ')'
                   end
                   filters_clauses << sql
                 end if filters and valid?
                 (filters_clauses << project_statement).join(' AND ')
               end
               # Returns the issue count
               def issue_count
                 Issue.count(:include => [:status, :project], :conditions => statement)
               rescue ::ActiveRecord::StatementInvalid => e
                 raise StatementInvalid.new(e.message)
               end
               # Returns the issue count by group or nil if query is not grouped
               def issue_count_by_group
                 r = nil
                 if grouped?
                   begin
                     # Rails will raise an (unexpected) RecordNotFound if there's only a nil group value
                     r = Issue.count(:group => group_by_statement, :include => [:status, :project], :conditions => statement)
                   rescue ActiveRecord::RecordNotFound
                     r = {nil => issue_count}
                   end
                   c = group_by_column
                   if c.is_a?(QueryCustomFieldColumn)
                     r = r.keys.inject({}) {|h, k| h[c.custom_field.cast_value(k)] = r[k]; h}
                   end
                 end
                 r
               rescue ::ActiveRecord::StatementInvalid => e
                 raise StatementInvalid.new(e.message)
               end
               # Returns the issues
               # Valid options are :order, :offset, :limit, :include, :conditions
               def issues(options={})
                 order_option = [group_by_sort_order, options[:order]].reject {|s| s.blank?}.join(',')
                 order_option = nil if order_option.blank?
                 Issue.find :all, :include => ([:status, :project] + (options[:include] || [])).uniq,
                                  :conditions => Query.merge_conditions(statement, options[:conditions]),
                                  :order => order_option,
                                  :limit  => options[:limit],
                                  :offset => options[:offset]
               rescue ::ActiveRecord::StatementInvalid => e
                 raise StatementInvalid.new(e.message)
               end
               # Returns the journals
               # Valid options are :order, :offset, :limit
               def journals(options={})
                 Journal.find :all, :include => [:details, :user, {:issue => [:project, :author, :tracker, :status]}],
                                    :conditions => statement,
                                    :order => options[:order],
                                    :limit => options[:limit],
                                    :offset => options[:offset]
               rescue ::ActiveRecord::StatementInvalid => e
                 raise StatementInvalid.new(e.message)
               end
               # Returns the versions
               # Valid options are :conditions
               def versions(options={})
                 Version.find :all, :include => :project,
                                    :conditions => Query.merge_conditions(project_statement, options[:conditions])
               rescue ::ActiveRecord::StatementInvalid => e
                 raise StatementInvalid.new(e.message)
               end
               private
               # Helper method to generate the WHERE sql for a +field+, +operator+ and a +value+
               def sql_for_field(field, operator, value, db_table, db_field, is_custom_filter=false)
                 sql = ''
                 case operator
                 when "="
                   if value.any?
                     sql = "#{db_table}.#{db_field} IN (" + value.collect{|val| "'#{connection.quote_string(val)}'"}.join(",") + ")"
                   else
                     # IN an empty set
                     sql = "1=0"
                   end
                 when "!"
                   if value.any?
                     sql = "(#{db_table}.#{db_field} IS NULL OR #{db_table}.#{db_field} NOT IN (" + value.collect{|val| "'#{connection.quote_string(val)}'"}.join(",") + "))"
                   else
                     # NOT IN an empty set
                     sql = "1=1"
                   end
                 when "!*"
                   sql = "#{db_table}.#{db_field} IS NULL"
                   sql << " OR #{db_table}.#{db_field} = ''" if is_custom_filter
                 when "*"
                   sql = "#{db_table}.#{db_field} IS NOT NULL"
                   sql << " AND #{db_table}.#{db_field} <> ''" if is_custom_filter
                 when ">="
                   sql = "#{db_table}.#{db_field} >= #{value.first.to_i}"
                 when "<="
                   sql = "#{db_table}.#{db_field} <= #{value.first.to_i}"
                 when "o"
                   sql = "#{IssueStatus.table_name}.is_closed=#{connection.quoted_false}" if field == "status_id"
                 when "c"
                   sql = "#{IssueStatus.table_name}.is_closed=#{connection.quoted_true}" if field == "status_id"
                 when ">t-"
                   sql = date_range_clause(db_table, db_field, - value.first.to_i, 0)
                 when "<t-"
                   sql = date_range_clause(db_table, db_field, nil, - value.first.to_i)
                 when "t-"
                   sql = date_range_clause(db_table, db_field, - value.first.to_i, - value.first.to_i)
                 when ">t+"
                   sql = date_range_clause(db_table, db_field, value.first.to_i, nil)
                 when "<t+"
                   sql = date_range_clause(db_table, db_field, 0, value.first.to_i)
                 when "t+"
                   sql = date_range_clause(db_table, db_field, value.first.to_i, value.first.to_i)
                 when "t"
                   sql = date_range_clause(db_table, db_field, 0, 0)
                 when "w"
                   from = l(:general_first_day_of_week) == '7' ?
                   # week starts on sunday
                   ((Date.today.cwday == 7) ? Time.now.at_beginning_of_day : Time.now.at_beginning_of_week - 1.day) :
                     # week starts on monday (Rails default)
                     Time.now.at_beginning_of_week
                   sql = "#{db_table}.#{db_field} BETWEEN '%s' AND '%s'" % [connection.quoted_date(from), connection.quoted_date(from + 7.days)]
                 when "~"
                   sql = "LOWER(#{db_table}.#{db_field}) LIKE '%#{connection.quote_string(value.first.to_s.downcase)}%'"
                 when "!~"
                   sql = "LOWER(#{db_table}.#{db_field}) NOT LIKE '%#{connection.quote_string(value.first.to_s.downcase)}%'"
                 end
                 return sql
               end
               def add_custom_fields_filters(custom_fields)
                 @available_filters ||= {}
                 custom_fields.select(&:is_filter?).each do |field|
                   case field.field_format
                   when "text"
                     options = { :type => :text, :order => 20 }
                   when "list"
                     options = { :type => :list_optional, :values => field.possible_values, :order => 20}
                   when "date"
                     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
                   @available_filters["cf_#{field.id}"] = options.merge({ :name => field.name })
                 end
               end
               # Returns a SQL clause for a date or datetime field.
               def date_range_clause(table, field, from, to)
                 s = []
                 if from
                   s << ("#{table}.#{field} > '%s'" % [connection.quoted_date((Date.yesterday + from).to_time.end_of_day)])
                 end
                 if to
                   s << ("#{table}.#{field} <= '%s'" % [connection.quoted_date((Date.today + to).to_time.end_of_day)])
                 end
                 s.join(' AND ')
               end
             end

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

             <%= error_messages_for 'custom_field' %>
             <script type="text/javascript">
             //<![CDATA[
             function toggle_custom_field_format() {
               format = $("custom_field_field_format");
               p_length = $("custom_field_min_length");
               p_regexp = $("custom_field_regexp");
               p_values = $("custom_field_possible_values");
               p_searchable = $("custom_field_searchable");
               p_default = $("custom_field_default_value");
               p_default.setAttribute('type','text');
               Element.show(p_default.parentNode);
               switch (format.value) {
                 case "list":
                   Element.hide(p_length.parentNode);
                   Element.hide(p_regexp.parentNode);
                   if (p_searchable) Element.show(p_searchable.parentNode);
                   Element.show(p_values.parentNode);
                   break;
                 case "bool":
                   p_default.setAttribute('type','checkbox');
                   Element.hide(p_length.parentNode);
                   Element.hide(p_regexp.parentNode);
                   if (p_searchable) Element.hide(p_searchable.parentNode);
                   Element.hide(p_values.parentNode);
                   break;
                 case "date":
                   Element.hide(p_length.parentNode);
                   Element.hide(p_regexp.parentNode);
                   if (p_searchable) Element.hide(p_searchable.parentNode);
                   Element.hide(p_values.parentNode);
                   break;
                 case "float":
                 case "int":
                   Element.show(p_length.parentNode);
                   Element.show(p_regexp.parentNode);
                   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);
                   if (p_searchable) Element.show(p_searchable.parentNode);
                   Element.hide(p_values.parentNode);
                   break;
               }
             }
             //]]>
             </script>
             <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 %> -
                <%= f.text_field :max_length, :size => 5, :no_label => true %><br>(<%=l(:text_min_max_length_info)%>)</p>
             <p><%= f.text_field :regexp, :size => 50 %><br>(<%=l(:text_regexp_info)%>)</p>
             <p>
             	<%= f.text_area :possible_values, :value => @custom_field.possible_values.to_a.join("\n"), :rows => 15 %>
               <br /><em><%= l(:text_custom_field_possible_values_info) %></em>
             </p>
             <p><%= @custom_field.field_format == 'bool' ? f.check_box(:default_value) : f.text_field(:default_value) %></p>
             <%= call_hook(:view_custom_fields_form_upper_box, :custom_field => @custom_field, :form => f) %>
             </div>
             <div class="box">
             <% case @custom_field.class.name
             when "IssueCustomField" %>
                 <fieldset><legend><%=l(:label_tracker_plural)%></legend>
                 <% for tracker in @trackers %>
                     <%= check_box_tag "custom_field[tracker_ids][]", tracker.id, (@custom_field.trackers.include? tracker) %> <%= tracker.name %>
                 <% end %>
             		<%= hidden_field_tag "custom_field[tracker_ids][]", '' %>
                 </fieldset>
                 &nbsp;
                 <p><%= f.check_box :is_required %></p>
                 <p><%= f.check_box :is_for_all %></p>
                 <p><%= f.check_box :is_filter %></p>
                 <p><%= f.check_box :searchable %></p>
             <% when "UserCustomField" %>
                 <p><%= f.check_box :is_required %></p>
                 <p><%= f.check_box :visible %></p>
                 <p><%= f.check_box :editable %></p>
             <% when "ProjectCustomField" %>
                 <p><%= f.check_box :is_required %></p>
                 <p><%= f.check_box :visible %></p>
                 <p><%= f.check_box :searchable %></p>
             <% when "TimeEntryCustomField" %>
                 <p><%= f.check_box :is_required %></p>
             <% else %>
                 <p><%= f.check_box :is_required %></p>
             <% end %>
             <%= call_hook(:"view_custom_fields_form_#{@custom_field.type.to_s.underscore}", :custom_field => @custom_field, :form => f) %>
             </div>
             <%= javascript_tag "toggle_custom_field_format();" %>

lib/redmine.rb +2 0

             require 'redmine/access_control'
             require 'redmine/menu_manager'
             require 'redmine/activity'
             require 'redmine/search'
             require 'redmine/custom_field_format'
             require 'redmine/mime_type'
             require 'redmine/core_ext'
             require 'redmine/themes'
             require 'redmine/hook'
             require 'redmine/plugin'
             require 'redmine/notifiable'
             require 'redmine/wiki_formatting'
             require 'redmine/scm/base'
             begin
               require_library_or_gem 'RMagick' unless Object.const_defined?(:Magick)
             rescue LoadError
               # RMagick is not available
             end
             if RUBY_VERSION < '1.9'
               require 'faster_csv'
             else
               require 'csv'
               FCSV = CSV
             end
             Redmine::Scm::Base.add "Subversion"
             Redmine::Scm::Base.add "Darcs"
             Redmine::Scm::Base.add "Mercurial"
             Redmine::Scm::Base.add "Cvs"
             Redmine::Scm::Base.add "Bazaar"
             Redmine::Scm::Base.add "Git"
             Redmine::Scm::Base.add "Filesystem"
             Redmine::CustomFieldFormat.map do |fields|
               fields.register Redmine::CustomFieldFormat.new('string', :label => :label_string, :order => 1)
               fields.register Redmine::CustomFieldFormat.new('text', :label => :label_text, :order => 2)
               fields.register Redmine::CustomFieldFormat.new('int', :label => :label_integer, :order => 3)
               fields.register Redmine::CustomFieldFormat.new('float', :label => :label_float, :order => 4)
               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
             Redmine::AccessControl.map do |map|
               map.permission :view_project, {:projects => [:show], :activities => [:index]}, :public => true
               map.permission :search_project, {:search => :index}, :public => true
               map.permission :add_project, {:projects => [:new, :create]}, :require => :loggedin
               map.permission :edit_project, {:projects => [:settings, :edit, :update]}, :require => :member
               map.permission :select_project_modules, {:projects => :modules}, :require => :member
               map.permission :manage_members, {:projects => :settings, :members => [:new, :edit, :destroy, :autocomplete_for_member]}, :require => :member
               map.permission :manage_versions, {:projects => :settings, :versions => [:new, :create, :edit, :update, :close_completed, :destroy]}, :require => :member
               map.permission :add_subprojects, {:projects => [:new, :create]}, :require => :member
               map.project_module :issue_tracking do |map|
                 # Issue categories
                 map.permission :manage_categories, {:projects => :settings, :issue_categories => [:new, :edit, :destroy]}, :require => :member
                 # Issues
                 map.permission :view_issues, {:issues => [:index, :show],
                                               :auto_complete => [:issues],
                                               :context_menus => [:issues],
                                               :versions => [:index, :show, :status_by],
                                               :journals => [:index, :diff],
                                               :queries => :index,
                                               :reports => [:issue_report, :issue_report_details]}
                 map.permission :add_issues, {:issues => [:new, :create, :update_form]}
                 map.permission :edit_issues, {:issues => [:edit, :update, :bulk_edit, :bulk_update, :update_form], :journals => [:new]}
                 map.permission :manage_issue_relations, {:issue_relations => [:new, :destroy]}
                 map.permission :manage_subtasks, {}
                 map.permission :add_issue_notes, {:issues => [:edit, :update], :journals => [:new]}
                 map.permission :edit_issue_notes, {:journals => :edit}, :require => :loggedin
                 map.permission :edit_own_issue_notes, {:journals => :edit}, :require => :loggedin
                 map.permission :move_issues, {:issue_moves => [:new, :create]}, :require => :loggedin
                 map.permission :delete_issues, {:issues => :destroy}, :require => :member
                 # Queries
                 map.permission :manage_public_queries, {:queries => [:new, :edit, :destroy]}, :require => :member
                 map.permission :save_queries, {:queries => [:new, :edit, :destroy]}, :require => :loggedin
                 # Watchers
                 map.permission :view_issue_watchers, {}
                 map.permission :add_issue_watchers, {:watchers => :new}
                 map.permission :delete_issue_watchers, {:watchers => :destroy}
               end
               map.project_module :time_tracking do |map|
                 map.permission :log_time, {:timelog => [:new, :create, :edit, :update]}, :require => :loggedin
                 map.permission :view_time_entries, :timelog => [:index, :show], :time_entry_reports => [:report]
                 map.permission :edit_time_entries, {:timelog => [:new, :create, :edit, :update, :destroy]}, :require => :member
                 map.permission :edit_own_time_entries, {:timelog => [:new, :create, :edit, :update, :destroy]}, :require => :loggedin
                 map.permission :manage_project_activities, {:project_enumerations => [:update, :destroy]}, :require => :member
               end
               map.project_module :news do |map|
                 map.permission :manage_news, {:news => [:new, :create, :edit, :update, :destroy], :comments => [:destroy]}, :require => :member
                 map.permission :view_news, {:news => [:index, :show]}, :public => true
                 map.permission :comment_news, {:comments => :create}
               end
               map.project_module :documents do |map|
                 map.permission :manage_documents, {:documents => [:new, :edit, :destroy, :add_attachment]}, :require => :loggedin
                 map.permission :view_documents, :documents => [:index, :show, :download]
               end
               map.project_module :files do |map|
                 map.permission :manage_files, {:files => [:new, :create]}, :require => :loggedin
                 map.permission :view_files, :files => :index, :versions => :download
               end
               map.project_module :wiki do |map|
                 map.permission :manage_wiki, {:wikis => [:edit, :destroy]}, :require => :member
                 map.permission :rename_wiki_pages, {:wiki => :rename}, :require => :member
                 map.permission :delete_wiki_pages, {:wiki => :destroy}, :require => :member
                 map.permission :view_wiki_pages, :wiki => [:index, :show, :special, :date_index]
                 map.permission :export_wiki_pages, :wiki => [:export]
                 map.permission :view_wiki_edits, :wiki => [:history, :diff, :annotate]
                 map.permission :edit_wiki_pages, :wiki => [:edit, :update, :preview, :add_attachment]
                 map.permission :delete_wiki_pages_attachments, {}
                 map.permission :protect_wiki_pages, {:wiki => :protect}, :require => :member
               end
               map.project_module :repository do |map|
                 map.permission :manage_repository, {:repositories => [:edit, :committers, :destroy]}, :require => :member
                 map.permission :browse_repository, :repositories => [:show, :browse, :entry, :annotate, :changes, :diff, :stats, :graph]
                 map.permission :view_changesets, :repositories => [:show, :revisions, :revision]
                 map.permission :commit_access, {}
               end
               map.project_module :boards do |map|
                 map.permission :manage_boards, {:boards => [:new, :edit, :destroy]}, :require => :member
                 map.permission :view_messages, {:boards => [:index, :show], :messages => [:show]}, :public => true
                 map.permission :add_messages, {:messages => [:new, :reply, :quote]}
                 map.permission :edit_messages, {:messages => :edit}, :require => :member
                 map.permission :edit_own_messages, {:messages => :edit}, :require => :loggedin
                 map.permission :delete_messages, {:messages => :destroy}, :require => :member
                 map.permission :delete_own_messages, {:messages => :destroy}, :require => :loggedin
               end
               map.project_module :calendar do |map|
                 map.permission :view_calendar, :calendars => [:show, :update]
               end
               map.project_module :gantt do |map|
                 map.permission :view_gantt, :gantts => [:show, :update]
               end
             end
             Redmine::MenuManager.map :top_menu do |menu|
               menu.push :home, :home_path
               menu.push :my_page, { :controller => 'my', :action => 'page' }, :if => Proc.new { User.current.logged? }
               menu.push :projects, { :controller => 'projects', :action => 'index' }, :caption => :label_project_plural
               menu.push :administration, { :controller => 'admin', :action => 'index' }, :if => Proc.new { User.current.admin? }, :last => true
               menu.push :help, Redmine::Info.help_url, :last => true
             end
             Redmine::MenuManager.map :account_menu do |menu|
               menu.push :login, :signin_path, :if => Proc.new { !User.current.logged? }
               menu.push :register, { :controller => 'account', :action => 'register' }, :if => Proc.new { !User.current.logged? && Setting.self_registration? }
               menu.push :my_account, { :controller => 'my', :action => 'account' }, :if => Proc.new { User.current.logged? }
               menu.push :logout, :signout_path, :if => Proc.new { User.current.logged? }
             end
             Redmine::MenuManager.map :application_menu do |menu|
               # Empty
             end
             Redmine::MenuManager.map :admin_menu do |menu|
               menu.push :projects, {:controller => 'admin', :action => 'projects'}, :caption => :label_project_plural
               menu.push :users, {:controller => 'users'}, :caption => :label_user_plural
               menu.push :groups, {:controller => 'groups'}, :caption => :label_group_plural
               menu.push :roles, {:controller => 'roles'}, :caption => :label_role_and_permissions
               menu.push :trackers, {:controller => 'trackers'}, :caption => :label_tracker_plural
               menu.push :issue_statuses, {:controller => 'issue_statuses'}, :caption => :label_issue_status_plural,
                         :html => {:class => 'issue_statuses'}
               menu.push :workflows, {:controller => 'workflows', :action => 'edit'}, :caption => :label_workflow
               menu.push :custom_fields, {:controller => 'custom_fields'},  :caption => :label_custom_field_plural,
                         :html => {:class => 'custom_fields'}
               menu.push :enumerations, {:controller => 'enumerations'}
               menu.push :settings, {:controller => 'settings'}
               menu.push :ldap_authentication, {:controller => 'ldap_auth_sources', :action => 'index'},
                         :html => {:class => 'server_authentication'}
               menu.push :plugins, {:controller => 'admin', :action => 'plugins'}, :last => true
               menu.push :info, {:controller => 'admin', :action => 'info'}, :caption => :label_information_plural, :last => true
             end
             Redmine::MenuManager.map :project_menu do |menu|
               menu.push :overview, { :controller => 'projects', :action => 'show' }
               menu.push :activity, { :controller => 'activities', :action => 'index' }
               menu.push :roadmap, { :controller => 'versions', :action => 'index' }, :param => :project_id,
                           :if => Proc.new { |p| p.shared_versions.any? }
               menu.push :issues, { :controller => 'issues', :action => 'index' }, :param => :project_id, :caption => :label_issue_plural
               menu.push :new_issue, { :controller => 'issues', :action => 'new' }, :param => :project_id, :caption => :label_issue_new,
                           :html => { :accesskey => Redmine::AccessKeys.key_for(:new_issue) }
               menu.push :gantt, { :controller => 'gantts', :action => 'show' }, :param => :project_id, :caption => :label_gantt
               menu.push :calendar, { :controller => 'calendars', :action => 'show' }, :param => :project_id, :caption => :label_calendar
               menu.push :news, { :controller => 'news', :action => 'index' }, :param => :project_id, :caption => :label_news_plural
               menu.push :documents, { :controller => 'documents', :action => 'index' }, :param => :project_id, :caption => :label_document_plural
               menu.push :wiki, { :controller => 'wiki', :action => 'show', :id => nil }, :param => :project_id,
                           :if => Proc.new { |p| p.wiki && !p.wiki.new_record? }
               menu.push :boards, { :controller => 'boards', :action => 'index', :id => nil }, :param => :project_id,
                           :if => Proc.new { |p| p.boards.any? }, :caption => :label_board_plural
               menu.push :files, { :controller => 'files', :action => 'index' }, :caption => :label_file_plural, :param => :project_id
               menu.push :repository, { :controller => 'repositories', :action => 'show' },
                           :if => Proc.new { |p| p.repository && !p.repository.new_record? }
               menu.push :settings, { :controller => 'projects', :action => 'settings' }, :last => true
             end
             Redmine::Activity.map do |activity|
               activity.register :issues, :class_name => %w(Issue Journal)
               activity.register :changesets
               activity.register :news
               activity.register :documents, :class_name => %w(Document Attachment)
               activity.register :files, :class_name => 'Attachment'
               activity.register :wiki_edits, :class_name => 'WikiContent::Version', :default => false
               activity.register :messages, :default => false
               activity.register :time_entries, :default => false
             end
             Redmine::Search.map do |search|
               search.register :issues
               search.register :news
               search.register :documents
               search.register :changesets
               search.register :wiki_pages
               search.register :messages
               search.register :projects
             end
             Redmine::WikiFormatting.map do |format|
               format.register :textile, Redmine::WikiFormatting::Textile::Formatter, Redmine::WikiFormatting::Textile::Helper
             end
             ActionView::Template.register_template_handler :rsb, Redmine::Views::ApiTemplateHandler

lib/redmine/custom_field_format.rb +12 -9

             # 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.
             module Redmine
               class CustomFieldFormat
                 include Redmine::I18n
                 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)
                   send "format_as_#{name}", value
                 end
                 def format_as_date(value)
                   begin; format_date(value.to_date); rescue; value end
                 end
                 def format_as_bool(value)
                   l(value == "1" ? :general_text_Yes : :general_text_No)
                 end
                 ['string','text','int','float','list'].each do |name|
                   define_method("format_as_#{name}") {|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
                   def map(&block)
                     yield self
                   end
                   # Registers a custom field format
                   def register(custom_field_format, options={})
                     @@available[custom_field_format.name] = custom_field_format unless @@available.keys.include?(custom_field_format.name)
                   end
                   def available_formats
                     @@available.keys
                   end
                   def find_by_name(name)
                     @@available[name.to_s]
                   end
                   def label_for(name)
                     format = @@available[name.to_s]
                     format.label if format
                   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 ]
                     }
                   end
                   def format_value(value, field_format)
                     return "" unless value && !value.empty?
                     if format_type = find_by_name(field_format)
                       format_type.format(value)
                     else
                       value
                     end
                   end
                 end
               end
             end

test/functional/custom_fields_controller_test.rb +26 -6

             # Redmine - project management software
-            # Copyright (C) 2006-2009  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
             # 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.expand_path('../../test_helper', __FILE__)
             require 'custom_fields_controller'
             # Re-raise errors caught by the controller.
             class CustomFieldsController; def rescue_action(e) raise e end; end
             class CustomFieldsControllerTest < ActionController::TestCase
               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_get_new_issue_custom_field
+                get :new, :type => 'IssueCustomField'
+                assert_response :success
+                assert_template 'new'
+                assert_tag :select,
+                  :attributes => {:name => 'custom_field[field_format]'},
+                  :child => {
+                    :tag => 'option',
+                    :attributes => {:value => 'user'},
+                    :content => 'User'
+                  }
+                assert_tag :select,
+                  :attributes => {:name => 'custom_field[field_format]'},
+                  :child => {
+                    :tag => 'option',
+                    :attributes => {:value => 'version'},
+                    :content => 'Version'
+                  }
+              end
+              def test_get_new_with_invalid_custom_field_class_should_redirect_to_list
+                get :new, :type => 'UnknownCustomField'
+                assert_redirected_to '/custom_fields'
+              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?tab=IssueCustomField'
                 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'
-              end
             end

test/integration/issues_test.rb +73 -2

-            # 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
             # 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.expand_path('../../test_helper', __FILE__)
             class IssuesTest < ActionController::IntegrationTest
               fixtures :projects,
                        :users,
                        :roles,
                        :members,
                        :trackers,
                        :projects_trackers,
                        :enabled_modules,
                        :issue_statuses,
                        :issues,
                        :enumerations,
                        :custom_fields,
                        :custom_values,
                        :custom_fields_trackers
               # create an issue
               def test_add_issue
                 log_user('jsmith', 'jsmith')
                 get 'projects/1/issues/new', :tracker_id => '1'
                 assert_response :success
                 assert_template 'issues/new'
                 post 'projects/1/issues', :tracker_id => "1",
                                              :issue => { :start_date => "2006-12-26",
                                                          :priority_id => "4",
                                                          :subject => "new test issue",
                                                          :category_id => "",
                                                          :description => "new issue",
                                                          :done_ratio => "0",
                                                          :due_date => "",
                                                          :assigned_to_id => "" },
                                              :custom_fields => {'2' => 'Value for field 2'}
                 # find created issue
                 issue = Issue.find_by_subject("new test issue")
                 assert_kind_of Issue, issue
                 # check redirection
                 assert_redirected_to :controller => 'issues', :action => 'show', :id => issue
                 follow_redirect!
                 assert_equal issue, assigns(:issue)
                 # check issue attributes
                 assert_equal 'jsmith', issue.author.login
                 assert_equal 1, issue.project.id
                 assert_equal 1, issue.status.id
               end
               # add then remove 2 attachments to an issue
               def test_issue_attachements
                 log_user('jsmith', 'jsmith')
                 set_tmp_attachments_directory
                 put 'issues/1',
                      :notes => 'Some notes',
                      :attachments => {'1' => {'file' => uploaded_test_file('testfile.txt', 'text/plain'), 'description' => 'This is an attachment'}}
                 assert_redirected_to "/issues/1"
                 # make sure attachment was saved
                 attachment = Issue.find(1).attachments.find_by_filename("testfile.txt")
                 assert_kind_of Attachment, attachment
                 assert_equal Issue.find(1), attachment.container
                 assert_equal 'This is an attachment', attachment.description
                 # verify the size of the attachment stored in db
                 #assert_equal file_data_1.length, attachment.filesize
                 # verify that the attachment was written to disk
                 assert File.exist?(attachment.diskfile)
                 # remove the attachments
                 Issue.find(1).attachments.each(&:destroy)
                 assert_equal 0, Issue.find(1).attachments.length
               end
               def test_other_formats_links_on_get_index
                 get '/projects/ecookbook/issues'
                 %w(Atom PDF CSV).each do |format|
                   assert_tag :a, :content => format,
                                  :attributes => { :href => "/projects/ecookbook/issues.#{format.downcase}",
                                                   :rel => 'nofollow' }
                 end
               end
               def test_other_formats_links_on_post_index_without_project_id_in_url
                 post '/issues', :project_id => 'ecookbook'
                 %w(Atom PDF CSV).each do |format|
                   assert_tag :a, :content => format,
                                  :attributes => { :href => "/projects/ecookbook/issues.#{format.downcase}",
                                                   :rel => 'nofollow' }
                 end
               end
               def test_pagination_links_on_get_index
                 Setting.per_page_options = '2'
                 get '/projects/ecookbook/issues'
                 assert_tag :a, :content => '2',
                                :attributes => { :href => '/projects/ecookbook/issues?page=2' }
               end
               def test_pagination_links_on_post_index_without_project_id_in_url
                 Setting.per_page_options = '2'
                 post '/issues', :project_id => 'ecookbook'
                 assert_tag :a, :content => '2',
                                :attributes => { :href => '/projects/ecookbook/issues?page=2' }
               end
+              def test_issue_with_user_custom_field
+                @field = IssueCustomField.create!(:name => 'Tester', :field_format => 'user', :is_for_all => true, :trackers => Tracker.all)
+                Role.anonymous.add_permission! :add_issues, :edit_issues
+                users = Project.find(1).users
+                tester = users.first
+                # Issue form
+                get '/projects/ecookbook/issues/new'
+                assert_response :success
+                assert_tag :select,
+                  :attributes => {:name => "issue[custom_field_values][#{@field.id}]"},
+                  :children => {:count => (users.size + 1)}, # +1 for blank value
+                  :child => {
+                    :tag => 'option',
+                    :attributes => {:value => tester.id.to_s},
+                    :content => tester.name
+                  }
+                # Create issue
+                assert_difference 'Issue.count' do
+                  post '/projects/ecookbook/issues',
+                    :issue => {
+                      :tracker_id => '1',
+                      :priority_id => '4',
+                      :subject => 'Issue with user custom field',
+                      :custom_field_values => {@field.id.to_s => users.first.id.to_s}
+                    }
+                end
+                issue = Issue.first(:order => 'id DESC')
+                assert_response 302
+                # Issue view
+                follow_redirect!
+                assert_tag :th,
+                  :content => /Tester/,
+                  :sibling => {
+                    :tag => 'td',
+                    :content => tester.name
+                  }
+                assert_tag :select,
+                  :attributes => {:name => "issue[custom_field_values][#{@field.id}]"},
+                  :children => {:count => (users.size + 1)}, # +1 for blank value
+                  :child => {
+                    :tag => 'option',
+                    :attributes => {:value => tester.id.to_s, :selected => 'selected'},
+                    :content => tester.name
+                  }
+                # Update issue
+                new_tester = users[1]
+                assert_difference 'Journal.count' do
+                  put "/issues/#{issue.id}",
+                    :notes => 'Updating custom field',
+                    :issue => {
+                      :custom_field_values => {@field.id.to_s => new_tester.id.to_s}
+                    }
+                end
+                assert_response 302
+                # Issue view
+                follow_redirect!
+                assert_tag :content => 'Tester',
+                  :ancestor => {:tag => 'ul', :attributes => {:class => /details/}},
+                  :sibling => {
+                    :content => tester.name,
+                    :sibling => {
+                      :content => new_tester.name
+                    }
+                  }
+              end
             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
             # 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.
             module Redmine
               module Acts
                 module Customizable
                   def self.included(base)
                     base.extend ClassMethods
                   end
                   module ClassMethods
                     def acts_as_customizable(options = {})
                       return if self.included_modules.include?(Redmine::Acts::Customizable::InstanceMethods)
                       cattr_accessor :customizable_options
                       self.customizable_options = options
                       has_many :custom_values, :as => :customized,
                                                :include => :custom_field,
                                                :order => "#{CustomField.table_name}.position",
                                                :dependent => :delete_all
                       before_validation_on_create { |customized| customized.custom_field_values }
                       # Trigger validation only if custom values were changed
                       validates_associated :custom_values, :on => :update, :if => Proc.new { |customized| customized.custom_field_values_changed? }
                       send :include, Redmine::Acts::Customizable::InstanceMethods
                       # Save custom values when saving the customized object
                       after_save :save_custom_field_values
                     end
                   end
                   module InstanceMethods
                     def self.included(base)
                       base.extend ClassMethods
                     end
                     def available_custom_fields
                       CustomField.find(:all, :conditions => "type = '#{self.class.name}CustomField'",
                                              :order => 'position')
                     end
                     # Sets the values of the object's custom fields
                     # values is an array like [{'id' => 1, 'value' => 'foo'}, {'id' => 2, 'value' => 'bar'}]
                     def custom_fields=(values)
                       values_to_hash = values.inject({}) do |hash, v|
                         v = v.stringify_keys
                         if v['id'] && v.has_key?('value')
                           hash[v['id']] = v['value']
                         end
                         hash
                       end
                       self.custom_field_values = values_to_hash
                     end
                     # Sets the values of the object's custom fields
                     # values is a hash like {'1' => 'foo', 2 => 'bar'}
                     def custom_field_values=(values)
                       @custom_field_values_changed = true
                       values = values.stringify_keys
                       custom_field_values.each do |custom_value|
                         custom_value.value = values[custom_value.custom_field_id.to_s] if values.has_key?(custom_value.custom_field_id.to_s)
                       end if values.is_a?(Hash)
                       self.custom_values = custom_field_values
                     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
                       custom_field_values.select(&:visible?)
                     end
                     def custom_field_values_changed?
                       @custom_field_values_changed == true
                     end
                     def custom_value_for(c)
                       field_id = (c.is_a?(CustomField) ? c.id : c.to_i)
                       custom_values.detect {|v| v.custom_field_id == field_id }
                     end
                     def save_custom_field_values
                       custom_field_values.each(&:save)
                       @custom_field_values_changed = false
                       @custom_field_values = nil
                     end
                     def reset_custom_values!
                       @custom_field_values = nil
                       @custom_field_values_changed = true
                       values = custom_values.inject({}) {|h,v| h[v.custom_field_id] = v.value; h}
                       custom_values.each {|cv| cv.destroy unless custom_field_values.include?(cv)}
                     end
                     module ClassMethods
                     end
                   end
                 end
               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