kolan
/
Redmine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Adds support for multiselect custom fields (#1189). 

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8721 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Jean-Philippe Lang 2012-01-29 20:51:48 +00:00
parent 0c5af16e14
commit cd6db6a3cb
21 changed files with 657 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
app/helpers/custom_fields_helper.rb
View File

@ -36,6 +36,7 @@ module CustomFieldsHelper
def custom_field_tag(name, custom_value) def custom_field_tag(name, custom_value)
custom_field = custom_value.custom_field custom_field = custom_value.custom_field
field_name = "#{name}[custom_field_values][#{custom_field.id}]" field_name = "#{name}[custom_field_values][#{custom_field.id}]"
field_name << "[]" if custom_field.multiple?
field_id = "#{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) field_format = Redmine::CustomFieldFormat.find_by_name(custom_field.field_format)
@ -48,10 +49,22 @@ module CustomFieldsHelper
when "bool" when "bool"
hidden_field_tag(field_name, '0') + check_box_tag(field_name, '1', custom_value.true?, :id => field_id) hidden_field_tag(field_name, '0') + check_box_tag(field_name, '1', custom_value.true?, :id => field_id)
when "list" when "list"
blank_option = custom_field.is_required? ? blank_option = ''
(custom_field.default_value.blank? ? "<option value=\"\">--- #{l(:actionview_instancetag_blank_option)} ---</option>" : '') : unless custom_field.multiple?
'<option></option>' if custom_field.is_required?
select_tag(field_name, blank_option.html_safe + options_for_select(custom_field.possible_values_options(custom_value.customized), custom_value.value), :id => field_id) unless custom_field.default_value.present?
blank_option = "<option value=\"\">--- #{l(:actionview_instancetag_blank_option)} ---</option>"
end
else
blank_option = '<option></option>'
end
end
s = select_tag(field_name, blank_option.html_safe + options_for_select(custom_field.possible_values_options(custom_value.customized), custom_value.value),
:id => field_id, :multiple => custom_field.multiple?)
if custom_field.multiple?
s << hidden_field_tag(field_name, '')
end
s
else else
text_field_tag(field_name, custom_value.value, :id => field_id) text_field_tag(field_name, custom_value.value, :id => field_id)
end end
@ -71,6 +84,7 @@ module CustomFieldsHelper
def custom_field_tag_for_bulk_edit(name, custom_field, projects=nil) def custom_field_tag_for_bulk_edit(name, custom_field, projects=nil)
field_name = "#{name}[custom_field_values][#{custom_field.id}]" field_name = "#{name}[custom_field_values][#{custom_field.id}]"
field_name << "[]" if custom_field.multiple?
field_id = "#{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) field_format = Redmine::CustomFieldFormat.find_by_name(custom_field.field_format)
case field_format.try(:edit_as) case field_format.try(:edit_as)
@ -84,7 +98,11 @@ module CustomFieldsHelper
[l(:general_text_yes), '1'], [l(:general_text_yes), '1'],
[l(:general_text_no), '0']]), :id => field_id) [l(:general_text_no), '0']]), :id => field_id)
when "list" when "list"
select_tag(field_name, options_for_select([[l(:label_no_change_option), '']] + custom_field.possible_values_options(projects)), :id => field_id) options = []
options << [l(:label_no_change_option), ''] unless custom_field.multiple?
options += custom_field.possible_values_options(projects)
select_tag(field_name, options_for_select(options),
:id => field_id, :multiple => custom_field.multiple?)
else else
text_field_tag(field_name, '', :id => field_id) text_field_tag(field_name, '', :id => field_id)
end end
@ -98,7 +116,11 @@ module CustomFieldsHelper
# Return a string used to display a custom value # Return a string used to display a custom value
def format_value(value, field_format) def format_value(value, field_format)
Redmine::CustomFieldFormat.format_value(value, field_format) # Proxy if value.is_a?(Array)
value.collect {|v| format_value(v, field_format)}.join(', ')
else
Redmine::CustomFieldFormat.format_value(value, field_format)
end
end end
# Return an array of custom field formats which can be used in select_tag # Return an array of custom field formats which can be used in select_tag
@ -110,8 +132,18 @@ module CustomFieldsHelper
def render_api_custom_values(custom_values, api) def render_api_custom_values(custom_values, api)
api.array :custom_fields do api.array :custom_fields do
custom_values.each do |custom_value| custom_values.each do |custom_value|
api.custom_field :id => custom_value.custom_field_id, :name => custom_value.custom_field.name do attrs = {:id => custom_value.custom_field_id, :name => custom_value.custom_field.name}
api.value custom_value.value attrs.merge!(:multiple => true) if custom_value.custom_field.multiple?
api.custom_field attrs do
if custom_value.value.is_a?(Array)
api.array :value do
custom_value.value.each do |value|
api.value value unless value.blank?
end
end
else
api.value custom_value.value
end
end end
end end
end unless custom_values.empty? end unless custom_values.empty?

40
app/helpers/issues_helper.rb
View File

@ -161,7 +161,44 @@ module IssuesHelper
out out
end end
# Returns the textual representation of a journal details
# as an array of strings
def details_to_strings(details, no_html=false)
strings = []
values_by_field = {}
details.each do |detail|
if detail.property == 'cf'
field_id = detail.prop_key
field = CustomField.find_by_id(field_id)
if field && field.multiple?
values_by_field[field_id] ||= {:added => [], :deleted => []}
if detail.old_value
values_by_field[field_id][:deleted] << detail.old_value
end
if detail.value
values_by_field[field_id][:added] << detail.value
end
next
end
end
strings << show_detail(detail, no_html)
end
values_by_field.each do |field_id, changes|
detail = JournalDetail.new(:property => 'cf', :prop_key => field_id)
if changes[:added].any?
detail.value = changes[:added]
strings << show_detail(detail, no_html)
elsif changes[:deleted].any?
detail.old_value = changes[:deleted]
strings << show_detail(detail, no_html)
end
end
strings
end
# Returns the textual representation of a single journal detail
def show_detail(detail, no_html=false) def show_detail(detail, no_html=false)
multiple = false
case detail.property case detail.property
when 'attr' when 'attr'
field = detail.prop_key.to_s.gsub(/\_id$/, "") field = detail.prop_key.to_s.gsub(/\_id$/, "")
@ -192,6 +229,7 @@ module IssuesHelper
when 'cf' when 'cf'
custom_field = CustomField.find_by_id(detail.prop_key) custom_field = CustomField.find_by_id(detail.prop_key)
if custom_field if custom_field
multiple = custom_field.multiple?
label = custom_field.name label = custom_field.name
value = format_value(detail.value, custom_field.field_format) if detail.value value = format_value(detail.value, custom_field.field_format) if detail.value
old_value = format_value(detail.old_value, custom_field.field_format) if detail.old_value old_value = format_value(detail.old_value, custom_field.field_format) if detail.old_value
@ -232,6 +270,8 @@ module IssuesHelper
when 'attr', 'cf' when 'attr', 'cf'
if !detail.old_value.blank? if !detail.old_value.blank?
l(:text_journal_changed, :label => label, :old => old_value, :new => value).html_safe l(:text_journal_changed, :label => label, :old => old_value, :new => value).html_safe
elsif multiple
l(:text_journal_added, :label => label, :value => value).html_safe
else else
l(:text_journal_set_to, :label => label, :value => value).html_safe l(:text_journal_set_to, :label => label, :value => value).html_safe
end end

7
app/helpers/queries_helper.rb
View File

@ -31,7 +31,14 @@ module QueriesHelper
def column_content(column, issue) def column_content(column, issue)
value = column.value(issue) value = column.value(issue)
if value.is_a?(Array)
value.collect {|v| column_value(column, issue, v)}.compact.sort.join(', ')
else
column_value(column, issue, value)
end
end
def column_value(column, issue, value)
case value.class.name case value.class.name
when 'String' when 'String'
if column.name == :subject if column.name == :subject

21
app/models/custom_field.rb
View File

@ -38,6 +38,8 @@ class CustomField < ActiveRecord::Base
def set_searchable def set_searchable
# make sure these fields are not searchable # make sure these fields are not searchable
self.searchable = false if %w(int float date bool).include?(field_format) self.searchable = false if %w(int float date bool).include?(field_format)
# make sure only these fields can have multiple values
self.multiple = false unless %w(list user version).include?(field_format)
true true
end end
@ -123,6 +125,7 @@ class CustomField < ActiveRecord::Base
# objects by their value of the custom field. # objects by their value of the custom field.
# Returns false, if the custom field can not be used for sorting. # Returns false, if the custom field can not be used for sorting.
def order_statement def order_statement
return nil if multiple?
case field_format case field_format
when 'string', 'text', 'list', 'date', 'bool' when 'string', 'text', 'list', 'date', 'bool'
# COALESCE is here to make sure that blank and NULL values are sorted equally # COALESCE is here to make sure that blank and NULL values are sorted equally
@ -161,14 +164,24 @@ class CustomField < ActiveRecord::Base
nil nil
end end
# Returns the error message for the given value # Returns the error messages for the given value
# or an empty array if value is a valid value for the custom field # or an empty array if value is a valid value for the custom field
def validate_field_value(value) def validate_field_value(value)
errs = [] errs = []
if is_required? && value.blank? if value.is_a?(Array)
errs << ::I18n.t('activerecord.errors.messages.blank') if !multiple?
errs << ::I18n.t('activerecord.errors.messages.invalid')
end
if is_required? && value.detect(&:present?).nil?
errs << ::I18n.t('activerecord.errors.messages.blank')
end
value.each {|v| errs += validate_field_value_format(v)}
else
if is_required? && value.blank?
errs << ::I18n.t('activerecord.errors.messages.blank')
end
errs += validate_field_value_format(value)
end end
errs += validate_field_value_format(value)
errs errs
end end

33
app/models/issue.rb
View File

@ -429,7 +429,7 @@ class Issue < ActiveRecord::Base
else else
@attributes_before_change = attributes.dup @attributes_before_change = attributes.dup
@custom_values_before_change = {} @custom_values_before_change = {}
self.custom_values.each {|c| @custom_values_before_change.store c.custom_field_id, c.value } self.custom_field_values.each {|c| @custom_values_before_change.store c.custom_field_id, c.value }
end end
# Make sure updated_on is updated when adding a note. # Make sure updated_on is updated when adding a note.
updated_on_will_change! updated_on_will_change!
@ -1006,14 +1006,35 @@ class Issue < ActiveRecord::Base
end end
if @custom_values_before_change if @custom_values_before_change
# custom fields changes # custom fields changes
custom_values.each {|c| custom_field_values.each {|c|
before = @custom_values_before_change[c.custom_field_id] before = @custom_values_before_change[c.custom_field_id]
after = c.value after = c.value
next if before == after || (before.blank? && after.blank?) next if before == after || (before.blank? && after.blank?)
@current_journal.details << JournalDetail.new(:property => 'cf',
:prop_key => c.custom_field_id, if before.is_a?(Array) || after.is_a?(Array)
:old_value => before, before = [before] unless before.is_a?(Array)
:value => after) after = [after] unless after.is_a?(Array)
# values removed
(before - after).reject(&:blank?).each do |value|
@current_journal.details << JournalDetail.new(:property => 'cf',
:prop_key => c.custom_field_id,
:old_value => value,
:value => nil)
end
# values added
(after - before).reject(&:blank?).each do |value|
@current_journal.details << JournalDetail.new(:property => 'cf',
:prop_key => c.custom_field_id,
:old_value => nil,
:value => value)
end
else
@current_journal.details << JournalDetail.new(:property => 'cf',
:prop_key => c.custom_field_id,
:old_value => before,
:value => after)
end
} }
end end
@current_journal.save @current_journal.save

14
app/models/query.rb
View File

@ -57,7 +57,7 @@ class QueryCustomFieldColumn < QueryColumn
def initialize(custom_field) def initialize(custom_field)
self.name = "cf_#{custom_field.id}".to_sym self.name = "cf_#{custom_field.id}".to_sym
self.sortable = custom_field.order_statement || false self.sortable = custom_field.order_statement || false
if %w(list date bool int).include?(custom_field.field_format) if %w(list date bool int).include?(custom_field.field_format) && !custom_field.multiple?
self.groupable = custom_field.order_statement self.groupable = custom_field.order_statement
end end
self.groupable ||= false self.groupable ||= false
@ -73,8 +73,8 @@ class QueryCustomFieldColumn < QueryColumn
end end
def value(issue) def value(issue)
cv = issue.custom_values.detect {|v| v.custom_field_id == @cf.id} cv = issue.custom_values.select {|v| v.custom_field_id == @cf.id}.collect {|v| @cf.cast_value(v.value)}
cv && @cf.cast_value(cv.value) cv.size > 1 ? cv : cv.first
end end
def css_classes def css_classes
@ -694,7 +694,13 @@ class Query < ActiveRecord::Base
value.push User.current.id.to_s value.push User.current.id.to_s
end end
end end
"#{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=#{custom_field_id} WHERE " + not_in = nil
if operator == '!'
# Makes ! operator work for custom fields with multiple values
operator = '='
not_in = 'NOT'
end
"#{Issue.table_name}.id #{not_in} 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=#{custom_field_id} WHERE " +
sql_for_field(field, operator, value, db_table, db_field, true) + ')' sql_for_field(field, operator, value, db_table, db_field, true) + ')'
end end

8
app/views/custom_fields/_form.html.erb
View File

@ -9,6 +9,7 @@ function toggle_custom_field_format() {
p_values = $("custom_field_possible_values"); p_values = $("custom_field_possible_values");
p_searchable = $("custom_field_searchable"); p_searchable = $("custom_field_searchable");
p_default = $("custom_field_default_value"); p_default = $("custom_field_default_value");
p_multiple = $("custom_field_multiple");
p_default.setAttribute('type','text'); p_default.setAttribute('type','text');
Element.show(p_default.parentNode); Element.show(p_default.parentNode);
@ -19,6 +20,7 @@ function toggle_custom_field_format() {
Element.hide(p_regexp.parentNode); Element.hide(p_regexp.parentNode);
if (p_searchable) Element.show(p_searchable.parentNode); if (p_searchable) Element.show(p_searchable.parentNode);
Element.show(p_values.parentNode); Element.show(p_values.parentNode);
Element.show(p_multiple.parentNode);
break; break;
case "bool": case "bool":
p_default.setAttribute('type','checkbox'); p_default.setAttribute('type','checkbox');
@ -26,12 +28,14 @@ function toggle_custom_field_format() {
Element.hide(p_regexp.parentNode); Element.hide(p_regexp.parentNode);
if (p_searchable) Element.hide(p_searchable.parentNode); if (p_searchable) Element.hide(p_searchable.parentNode);
Element.hide(p_values.parentNode); Element.hide(p_values.parentNode);
Element.hide(p_multiple.parentNode);
break; break;
case "date": case "date":
Element.hide(p_length.parentNode); Element.hide(p_length.parentNode);
Element.hide(p_regexp.parentNode); Element.hide(p_regexp.parentNode);
if (p_searchable) Element.hide(p_searchable.parentNode); if (p_searchable) Element.hide(p_searchable.parentNode);
Element.hide(p_values.parentNode); Element.hide(p_values.parentNode);
Element.hide(p_multiple.parentNode);
break; break;
case "float": case "float":
case "int": case "int":
@ -39,6 +43,7 @@ function toggle_custom_field_format() {
Element.show(p_regexp.parentNode); Element.show(p_regexp.parentNode);
if (p_searchable) Element.hide(p_searchable.parentNode); if (p_searchable) Element.hide(p_searchable.parentNode);
Element.hide(p_values.parentNode); Element.hide(p_values.parentNode);
Element.hide(p_multiple.parentNode);
break; break;
case "user": case "user":
case "version": case "version":
@ -47,12 +52,14 @@ function toggle_custom_field_format() {
if (p_searchable) Element.hide(p_searchable.parentNode); if (p_searchable) Element.hide(p_searchable.parentNode);
Element.hide(p_values.parentNode); Element.hide(p_values.parentNode);
Element.hide(p_default.parentNode); Element.hide(p_default.parentNode);
Element.show(p_multiple.parentNode);
break; break;
default: default:
Element.show(p_length.parentNode); Element.show(p_length.parentNode);
Element.show(p_regexp.parentNode); Element.show(p_regexp.parentNode);
if (p_searchable) Element.show(p_searchable.parentNode); if (p_searchable) Element.show(p_searchable.parentNode);
Element.hide(p_values.parentNode); Element.hide(p_values.parentNode);
Element.hide(p_multiple.parentNode);
break; break;
} }
} }
@ -64,6 +71,7 @@ function toggle_custom_field_format() {
<p><%= f.text_field :name, :required => true %></p> <p><%= f.text_field :name, :required => true %></p>
<p><%= f.select :field_format, custom_field_formats_for_select(@custom_field), {}, :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> :disabled => !@custom_field.new_record? %></p>
<p><%= f.check_box :multiple, :disabled => !@custom_field.new_record? %></p>
<p><label for="custom_field_min_length"><%=l(:label_min_max_length)%></label> <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 :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> <%= f.text_field :max_length, :size => 5, :no_label => true %><br />(<%=l(:text_min_max_length_info)%>)</p>

4
app/views/issues/_history.html.erb
View File

@ -8,8 +8,8 @@
<% if journal.details.any? %> <% if journal.details.any? %>
<ul class="details"> <ul class="details">
<% for detail in journal.details %> <% details_to_strings(journal.details).each do |string| %>
<li><%= show_detail(detail) %></li> <li><%= string %></li>
<% end %> <% end %>
</ul> </ul>
<% end %> <% end %>

4
app/views/journals/index.builder
View File

@ -19,8 +19,8 @@ xml.feed "xmlns" => "http://www.w3.org/2005/Atom" do
end end
xml.content "type" => "html" do xml.content "type" => "html" do
xml.text! '<ul>' xml.text! '<ul>'
change.details.each do |detail| details_to_strings(change.details, false).each do |string|
xml.text! '<li>' + show_detail(detail, false) + '</li>' xml.text! '<li>' + string + '</li>'
end end
xml.text! '</ul>' xml.text! '</ul>'
xml.text! textilizable(change, :notes, :only_path => false) unless change.notes.blank? xml.text! textilizable(change, :notes, :only_path => false) unless change.notes.blank?

4
app/views/mailer/issue_edit.html.erb
View File

@ -1,8 +1,8 @@
<%= l(:text_issue_updated, :id => "##{@issue.id}", :author => h(@journal.user)) %> <%= l(:text_issue_updated, :id => "##{@issue.id}", :author => h(@journal.user)) %>
<ul> <ul>
<% for detail in @journal.details %> <% details_to_strings(@journal.details).each do |string| %>
<li><%= show_detail(detail, true) %></li> <li><%= string %></li>
<% end %> <% end %>
</ul> </ul>

4
app/views/mailer/issue_edit.text.erb
View File

@ -1,7 +1,7 @@
<%= l(:text_issue_updated, :id => "##{@issue.id}", :author => @journal.user) %> <%= l(:text_issue_updated, :id => "##{@issue.id}", :author => @journal.user) %>
<% for detail in @journal.details -%> <% details_to_strings(@journal.details, true).each do |string| -%>
<%= show_detail(detail, true) %> <%= string %>
<% end -%> <% end -%>
<%= @journal.notes if @journal.notes? %> <%= @journal.notes if @journal.notes? %>

1
config/locales/en.yml
View File

@ -319,6 +319,7 @@ en:
field_cvsroot: CVSROOT field_cvsroot: CVSROOT
field_cvs_module: Module field_cvs_module: Module
field_repository_is_default: Main repository field_repository_is_default: Main repository
field_multiple: Multiple values
setting_app_title: Application title setting_app_title: Application title
setting_app_subtitle: Application subtitle setting_app_subtitle: Application subtitle

1
config/locales/fr.yml
View File

@ -318,6 +318,7 @@ fr:
field_is_private: Privée field_is_private: Privée
field_commit_logs_encoding: Encodage des messages de commit field_commit_logs_encoding: Encodage des messages de commit
field_repository_is_default: Dépôt principal field_repository_is_default: Dépôt principal
field_multiple: Valeurs multiples
setting_app_title: Titre de l'application setting_app_title: Titre de l'application
setting_app_subtitle: Sous-titre de l'application setting_app_subtitle: Sous-titre de l'application

9
db/migrate/20120127174243_add_custom_fields_multiple.rb Normal file
View File

@ -0,0 +1,9 @@
class AddCustomFieldsMultiple < ActiveRecord::Migration
def self.up
add_column :custom_fields, :multiple, :boolean, :default => false
end
def self.down
remove_column :custom_fields, :multiple
end
end

4
lib/redmine/export/pdf.rb
View File

@ -464,8 +464,8 @@ module Redmine
" - " + journal.user.name) " - " + journal.user.name)
pdf.Ln pdf.Ln
pdf.SetFontStyle('I',8) pdf.SetFontStyle('I',8)
for detail in journal.details details_to_strings(journal.details, true).each do |string|
pdf.RDMMultiCell(190,5, "- " + show_detail(detail, true)) pdf.RDMMultiCell(190,5, "- " + string)
end end
if journal.notes? if journal.notes?
pdf.Ln unless journal.details.empty? pdf.Ln unless journal.details.empty?

222
test/functional/issues_controller_test.rb
View File

@ -625,6 +625,36 @@ class IssuesControllerTest < ActionController::TestCase
:ancestor => {:tag => 'table', :attributes => {:class => /issues/}} :ancestor => {:tag => 'table', :attributes => {:class => /issues/}}
end end
def test_index_with_multi_custom_field_column
field = CustomField.find(1)
field.update_attribute :multiple, true
issue = Issue.find(1)
issue.custom_field_values = {1 => ['MySQL', 'Oracle']}
issue.save!
get :index, :set_filter => 1, :c => %w(tracker subject cf_1)
assert_response :success
assert_tag :td,
:attributes => {:class => /cf_1/},
:content => 'MySQL, Oracle'
end
def test_index_with_multi_user_custom_field_column
field = IssueCustomField.create!(:name => 'Multi user', :field_format => 'user', :multiple => true,
:tracker_ids => [1], :is_for_all => true)
issue = Issue.find(1)
issue.custom_field_values = {field.id => ['2', '3']}
issue.save!
get :index, :set_filter => 1, :c => ['tracker', 'subject', "cf_#{field.id}"]
assert_response :success
assert_tag :td,
:attributes => {:class => /cf_#{field.id}/},
:child => {:tag => 'a', :content => 'John Smith'}
end
def test_index_with_date_column def test_index_with_date_column
Issue.find(1).update_attribute :start_date, '1987-08-24' Issue.find(1).update_attribute :start_date, '1987-08-24'
@ -1032,6 +1062,33 @@ class IssuesControllerTest < ActionController::TestCase
assert_no_tag 'a', :content => /Next/ assert_no_tag 'a', :content => /Next/
end end
def test_show_with_multi_custom_field
field = CustomField.find(1)
field.update_attribute :multiple, true
issue = Issue.find(1)
issue.custom_field_values = {1 => ['MySQL', 'Oracle']}
issue.save!
get :show, :id => 1
assert_response :success
assert_tag :td, :content => 'MySQL, Oracle'
end
def test_show_with_multi_user_custom_field
field = IssueCustomField.create!(:name => 'Multi user', :field_format => 'user', :multiple => true,
:tracker_ids => [1], :is_for_all => true)
issue = Issue.find(1)
issue.custom_field_values = {field.id => ['2', '3']}
issue.save!
get :show, :id => 1
assert_response :success
# TODO: should display links
assert_tag :td, :content => 'John Smith, Dave Lopper'
end
def test_show_atom def test_show_atom
get :show, :id => 2, :format => 'atom' get :show, :id => 2, :format => 'atom'
assert_response :success assert_response :success
@ -1104,6 +1161,40 @@ class IssuesControllerTest < ActionController::TestCase
assert_no_tag 'input', :attributes => {:name => 'issue[watcher_user_ids][]'} assert_no_tag 'input', :attributes => {:name => 'issue[watcher_user_ids][]'}
end end
def test_get_new_with_multi_custom_field
field = IssueCustomField.find(1)
field.update_attribute :multiple, true
@request.session[:user_id] = 2
get :new, :project_id => 1, :tracker_id => 1
assert_response :success
assert_template 'new'
assert_tag 'select',
:attributes => {:name => 'issue[custom_field_values][1][]', :multiple => 'multiple'},
:children => {:count => 3},
:child => {:tag => 'option', :attributes => {:value => 'MySQL'}, :content => 'MySQL'}
assert_tag 'input',
:attributes => {:name => 'issue[custom_field_values][1][]', :value => ''}
end
def test_get_new_with_multi_user_custom_field
field = IssueCustomField.create!(:name => 'Multi user', :field_format => 'user', :multiple => true,
:tracker_ids => [1], :is_for_all => true)
@request.session[:user_id] = 2
get :new, :project_id => 1, :tracker_id => 1
assert_response :success
assert_template 'new'
assert_tag 'select',
:attributes => {:name => "issue[custom_field_values][#{field.id}][]", :multiple => 'multiple'},
:children => {:count => Project.find(1).users.count},
:child => {:tag => 'option', :attributes => {:value => '2'}, :content => 'John Smith'}
assert_tag 'input',
:attributes => {:name => "issue[custom_field_values][#{field.id}][]", :value => ''}
end
def test_get_new_without_default_start_date_is_creation_date def test_get_new_without_default_start_date_is_creation_date
Setting.default_issue_start_date_to_creation_date = 0 Setting.default_issue_start_date_to_creation_date = 0
@ -1303,6 +1394,60 @@ class IssuesControllerTest < ActionController::TestCase
assert_redirected_to :controller => 'issues', :action => 'show', :id => Issue.last.id assert_redirected_to :controller => 'issues', :action => 'show', :id => Issue.last.id
end end
def test_post_create_with_multi_custom_field
field = IssueCustomField.find_by_name('Database')
field.update_attribute(:multiple, true)
@request.session[:user_id] = 2
assert_difference 'Issue.count' do
post :create, :project_id => 1,
:issue => {:tracker_id => 1,
:subject => 'This is the test_new issue',
:description => 'This is the description',
:priority_id => 5,
:custom_field_values => {'1' => ['', 'MySQL', 'Oracle']}}
end
assert_response 302
issue = Issue.first(:order => 'id DESC')
assert_equal ['MySQL', 'Oracle'], issue.custom_field_value(1).sort
end
def test_post_create_with_empty_multi_custom_field
field = IssueCustomField.find_by_name('Database')
field.update_attribute(:multiple, true)
@request.session[:user_id] = 2
assert_difference 'Issue.count' do
post :create, :project_id => 1,
:issue => {:tracker_id => 1,
:subject => 'This is the test_new issue',
:description => 'This is the description',
:priority_id => 5,
:custom_field_values => {'1' => ['']}}
end
assert_response 302
issue = Issue.first(:order => 'id DESC')
assert_equal [''], issue.custom_field_value(1).sort
end
def test_post_create_with_multi_user_custom_field
field = IssueCustomField.create!(:name => 'Multi user', :field_format => 'user', :multiple => true,
:tracker_ids => [1], :is_for_all => true)
@request.session[:user_id] = 2
assert_difference 'Issue.count' do
post :create, :project_id => 1,
:issue => {:tracker_id => 1,
:subject => 'This is the test_new issue',
:description => 'This is the description',
:priority_id => 5,
:custom_field_values => {field.id.to_s => ['', '2', '3']}}
end
assert_response 302
issue = Issue.first(:order => 'id DESC')
assert_equal ['2', '3'], issue.custom_field_value(field).sort
end
def test_post_create_with_required_custom_field_and_without_custom_fields_param def test_post_create_with_required_custom_field_and_without_custom_fields_param
field = IssueCustomField.find_by_name('Database') field = IssueCustomField.find_by_name('Database')
field.update_attribute(:is_required, true) field.update_attribute(:is_required, true)
@ -1822,6 +1967,27 @@ class IssuesControllerTest < ActionController::TestCase
assert_tag :input, :attributes => { :name => 'time_entry[comments]', :value => 'test_get_edit_with_params' } assert_tag :input, :attributes => { :name => 'time_entry[comments]', :value => 'test_get_edit_with_params' }
end end
def test_get_edit_with_multi_custom_field
field = CustomField.find(1)
field.update_attribute :multiple, true
issue = Issue.find(1)
issue.custom_field_values = {1 => ['MySQL', 'Oracle']}
issue.save!
@request.session[:user_id] = 2
get :edit, :id => 1
assert_response :success
assert_template 'edit'
assert_tag 'select', :attributes => {:name => 'issue[custom_field_values][1][]', :multiple => 'multiple'}
assert_tag 'select', :attributes => {:name => 'issue[custom_field_values][1][]'},
:child => {:tag => 'option', :attributes => {:value => 'MySQL', :selected => 'selected'}}
assert_tag 'select', :attributes => {:name => 'issue[custom_field_values][1][]'},
:child => {:tag => 'option', :attributes => {:value => 'PostgreSQL', :selected => nil}}
assert_tag 'select', :attributes => {:name => 'issue[custom_field_values][1][]'},
:child => {:tag => 'option', :attributes => {:value => 'Oracle', :selected => 'selected'}}
end
def test_update_edit_form def test_update_edit_form
@request.session[:user_id] = 2 @request.session[:user_id] = 2
xhr :put, :new, :project_id => 1, xhr :put, :new, :project_id => 1,
@ -1979,6 +2145,27 @@ class IssuesControllerTest < ActionController::TestCase
assert mail.body.include?("Searchable field changed from 125 to New custom value") assert mail.body.include?("Searchable field changed from 125 to New custom value")
end end
def test_put_update_with_multi_custom_field_change
field = CustomField.find(1)
field.update_attribute :multiple, true
issue = Issue.find(1)
issue.custom_field_values = {1 => ['MySQL', 'Oracle']}
issue.save!
@request.session[:user_id] = 2
assert_difference('Journal.count') do
assert_difference('JournalDetail.count', 3) do
put :update, :id => 1,
:issue => {
:subject => 'Custom field change',
:custom_field_values => { '1' => ['', 'Oracle', 'PostgreSQL'] }
}
end
end
assert_redirected_to :action => 'show', :id => '1'
assert_equal ['Oracle', 'PostgreSQL'], Issue.find(1).custom_field_value(1).sort
end
def test_put_update_with_status_and_assignee_change def test_put_update_with_status_and_assignee_change
issue = Issue.find(1) issue = Issue.find(1)
assert_equal 1, issue.status_id assert_equal 1, issue.status_id
@ -2283,6 +2470,23 @@ class IssuesControllerTest < ActionController::TestCase
} }
end end
def test_get_bulk_edit_with_multi_custom_field
field = CustomField.find(1)
field.update_attribute :multiple, true
@request.session[:user_id] = 2
get :bulk_edit, :ids => [1, 2]
assert_response :success
assert_template 'bulk_edit'
assert_tag :select,
:attributes => {:name => "issue[custom_field_values][1][]"},
:children => {
:only => {:tag => 'option'},
:count => 3
}
end
def test_bulk_update def test_bulk_update
@request.session[:user_id] = 2 @request.session[:user_id] = 2
# update issues priority # update issues priority
@ -2463,6 +2667,24 @@ class IssuesControllerTest < ActionController::TestCase
assert_equal '777', journal.details.first.value assert_equal '777', journal.details.first.value
end end
def test_bulk_update_multi_custom_field
field = CustomField.find(1)
field.update_attribute :multiple, true
@request.session[:user_id] = 2
post :bulk_update, :ids => [1, 2, 3], :notes => 'Bulk editing multi custom field',
:issue => {:priority_id => '',
:assigned_to_id => '',
:custom_field_values => {'1' => ['MySQL', 'Oracle']}}
assert_response 302
assert_equal ['MySQL', 'Oracle'], Issue.find(1).custom_field_value(1).sort
assert_equal ['MySQL', 'Oracle'], Issue.find(3).custom_field_value(1).sort
# the custom field is not associated with the issue tracker
assert_nil Issue.find(2).custom_field_value(1)
end
def test_bulk_update_unassign def test_bulk_update_unassign
assert_not_nil Issue.find(2).assigned_to assert_not_nil Issue.find(2).assigned_to
@request.session[:user_id] = 2 @request.session[:user_id] = 2

120
test/integration/api_test/issues_test.rb
View File

@ -258,6 +258,108 @@ class ApiTest::IssuesTest < ActionController::IntegrationTest
end end
end end
context "with multi custom fields" do
setup do
field = CustomField.find(1)
field.update_attribute :multiple, true
issue = Issue.find(3)
issue.custom_field_values = {1 => ['MySQL', 'Oracle']}
issue.save!
end
context ".xml" do
should "display custom fields" do
get '/issues/3.xml'
assert_response :success
assert_tag :tag => 'issue',
:child => {
:tag => 'custom_fields',
:attributes => { :type => 'array' },
:child => {
:tag => 'custom_field',
:attributes => { :id => '1'},
:child => {
:tag => 'value',
:attributes => { :type => 'array' },
:children => { :count => 2 }
}
}
}
xml = Hash.from_xml(response.body)
custom_fields = xml['issue']['custom_fields']
assert_kind_of Array, custom_fields
field = custom_fields.detect {|f| f['id'] == '1'}
assert_kind_of Hash, field
assert_equal ['MySQL', 'Oracle'], field['value'].sort
end
end
context ".json" do
should "display custom fields" do
get '/issues/3.json'
assert_response :success
json = ActiveSupport::JSON.decode(response.body)
custom_fields = json['issue']['custom_fields']
assert_kind_of Array, custom_fields
field = custom_fields.detect {|f| f['id'] == 1}
assert_kind_of Hash, field
assert_equal ['MySQL', 'Oracle'], field['value'].sort
end
end
end
context "with empty value for multi custom field" do
setup do
field = CustomField.find(1)
field.update_attribute :multiple, true
issue = Issue.find(3)
issue.custom_field_values = {1 => ['']}
issue.save!
end
context ".xml" do
should "display custom fields" do
get '/issues/3.xml'
assert_response :success
assert_tag :tag => 'issue',
:child => {
:tag => 'custom_fields',
:attributes => { :type => 'array' },
:child => {
:tag => 'custom_field',
:attributes => { :id => '1'},
:child => {
:tag => 'value',
:attributes => { :type => 'array' },
:children => { :count => 0 }
}
}
}
xml = Hash.from_xml(response.body)
custom_fields = xml['issue']['custom_fields']
assert_kind_of Array, custom_fields
field = custom_fields.detect {|f| f['id'] == '1'}
assert_kind_of Hash, field
assert_equal [], field['value']
end
end
context ".json" do
should "display custom fields" do
get '/issues/3.json'
assert_response :success
json = ActiveSupport::JSON.decode(response.body)
custom_fields = json['issue']['custom_fields']
assert_kind_of Array, custom_fields
field = custom_fields.detect {|f| f['id'] == 1}
assert_kind_of Hash, field
assert_equal [], field['value'].sort
end
end
end
context "with attachments" do context "with attachments" do
context ".xml" do context ".xml" do
should "display attachments" do should "display attachments" do
@ -455,6 +557,24 @@ class ApiTest::IssuesTest < ActionController::IntegrationTest
end end
end end
context "PUT /issues/3.xml with multi custom fields" do
setup do
field = CustomField.find(1)
field.update_attribute :multiple, true
@parameters = {:issue => {:custom_fields => [{'id' => '1', 'value' => ['MySQL', 'PostgreSQL'] }, {'id' => '2', 'value' => '150'}]}}
end
should "update custom fields" do
assert_no_difference('Issue.count') do
put '/issues/3.xml', @parameters, credentials('jsmith')
end
issue = Issue.find(3)
assert_equal '150', issue.custom_value_for(2).value
assert_equal ['MySQL', 'PostgreSQL'], issue.custom_field_value(1)
end
end
context "PUT /issues/3.xml with project change" do context "PUT /issues/3.xml with project change" do
setup do setup do
@parameters = {:issue => {:project_id => 2, :subject => 'Project changed'}} @parameters = {:issue => {:project_id => 2, :subject => 'Project changed'}}

22
test/unit/custom_field_test.rb
View File

@ -164,4 +164,26 @@ class CustomFieldTest < ActiveSupport::TestCase
assert f.valid_field_value?('5') assert f.valid_field_value?('5')
assert !f.valid_field_value?('6abc') assert !f.valid_field_value?('6abc')
end end
def test_multi_field_validation
f = CustomField.new(:field_format => 'list', :multiple => 'true', :possible_values => ['value1', 'value2'])
assert f.valid_field_value?(nil)
assert f.valid_field_value?('')
assert f.valid_field_value?([])
assert f.valid_field_value?([nil])
assert f.valid_field_value?([''])
assert f.valid_field_value?('value2')
assert !f.valid_field_value?('abc')
assert f.valid_field_value?(['value2'])
assert !f.valid_field_value?(['abc'])
assert f.valid_field_value?(['', 'value2'])
assert !f.valid_field_value?(['', 'abc'])
assert f.valid_field_value?(['value1', 'value2'])
assert !f.valid_field_value?(['value1', 'abc'])
end
end end

30
test/unit/issue_test.rb
View File

@ -921,6 +921,36 @@ class IssueTest < ActiveSupport::TestCase
end end
end end
def test_journalized_multi_custom_field
field = IssueCustomField.create!(:name => 'filter', :field_format => 'list', :is_filter => true, :is_for_all => true,
:tracker_ids => [1], :possible_values => ['value1', 'value2', 'value3'], :multiple => true)
issue = Issue.create!(:project_id => 1, :tracker_id => 1, :subject => 'Test', :author_id => 1)
assert_difference 'Journal.count' do
assert_difference 'JournalDetail.count' do
issue.init_journal(User.first)
issue.custom_field_values = {field.id => ['value1']}
issue.save!
end
assert_difference 'JournalDetail.count' do
issue.init_journal(User.first)
issue.custom_field_values = {field.id => ['value1', 'value2']}
issue.save!
end
assert_difference 'JournalDetail.count', 2 do
issue.init_journal(User.first)
issue.custom_field_values = {field.id => ['value3', 'value2']}
issue.save!
end
assert_difference 'JournalDetail.count', 2 do
issue.init_journal(User.first)
issue.custom_field_values = {field.id => nil}
issue.save!
end
end
end
def test_description_eol_should_be_normalized def test_description_eol_should_be_normalized
i = Issue.new(:description => "CR \r LF \n CRLF \r\n") i = Issue.new(:description => "CR \r LF \n CRLF \r\n")
assert_equal "CR \r\n LF \r\n CRLF \r\n", i.description assert_equal "CR \r\n LF \r\n CRLF \r\n", i.description

64
test/unit/query_test.rb
View File

@ -173,6 +173,44 @@ class QueryTest < ActiveSupport::TestCase
assert_equal 2, issues.first.id assert_equal 2, issues.first.id
end end
def test_operator_is_on_multi_list_custom_field
f = IssueCustomField.create!(:name => 'filter', :field_format => 'list', :is_filter => true, :is_for_all => true,
:possible_values => ['value1', 'value2', 'value3'], :multiple => true)
CustomValue.create!(:custom_field => f, :customized => Issue.find(1), :value => 'value1')
CustomValue.create!(:custom_field => f, :customized => Issue.find(1), :value => 'value2')
CustomValue.create!(:custom_field => f, :customized => Issue.find(3), :value => 'value1')
query = Query.new(:name => '_')
query.add_filter("cf_#{f.id}", '=', ['value1'])
issues = find_issues_with_query(query)
assert_equal [1, 3], issues.map(&:id).sort
query = Query.new(:name => '_')
query.add_filter("cf_#{f.id}", '=', ['value2'])
issues = find_issues_with_query(query)
assert_equal [1], issues.map(&:id).sort
end
def test_operator_is_not_on_multi_list_custom_field
f = IssueCustomField.create!(:name => 'filter', :field_format => 'list', :is_filter => true, :is_for_all => true,
:possible_values => ['value1', 'value2', 'value3'], :multiple => true)
CustomValue.create!(:custom_field => f, :customized => Issue.find(1), :value => 'value1')
CustomValue.create!(:custom_field => f, :customized => Issue.find(1), :value => 'value2')
CustomValue.create!(:custom_field => f, :customized => Issue.find(3), :value => 'value1')
query = Query.new(:name => '_')
query.add_filter("cf_#{f.id}", '!', ['value1'])
issues = find_issues_with_query(query)
assert !issues.map(&:id).include?(1)
assert !issues.map(&:id).include?(3)
query = Query.new(:name => '_')
query.add_filter("cf_#{f.id}", '!', ['value2'])
issues = find_issues_with_query(query)
assert !issues.map(&:id).include?(1)
assert issues.map(&:id).include?(3)
end
def test_operator_greater_than def test_operator_greater_than
query = Query.new(:project => Project.find(1), :name => '_') query = Query.new(:project => Project.find(1), :name => '_')
query.add_filter('done_ratio', '>=', ['40']) query.add_filter('done_ratio', '>=', ['40'])
@ -492,7 +530,18 @@ class QueryTest < ActiveSupport::TestCase
def test_groupable_columns_should_include_custom_fields def test_groupable_columns_should_include_custom_fields
q = Query.new q = Query.new
assert q.groupable_columns.detect {|c| c.is_a? QueryCustomFieldColumn} column = q.groupable_columns.detect {|c| c.name == :cf_1}
assert_not_nil column
assert_kind_of QueryCustomFieldColumn, column
end
def test_groupable_columns_should_not_include_multi_custom_fields
field = CustomField.find(1)
field.update_attribute :multiple, true
q = Query.new
column = q.groupable_columns.detect {|c| c.name == :cf_1}
assert_nil column
end end
def test_grouped_with_valid_column def test_grouped_with_valid_column
@ -527,6 +576,19 @@ class QueryTest < ActiveSupport::TestCase
end end
end end
def test_sortable_columns_should_include_custom_field
q = Query.new
assert q.sortable_columns['cf_1']
end
def test_sortable_columns_should_not_include_multi_custom_field
field = CustomField.find(1)
field.update_attribute :multiple, true
q = Query.new
assert !q.sortable_columns['cf_1']
end
def test_default_sort def test_default_sort
q = Query.new q = Query.new
assert_equal [], q.sort_criteria assert_equal [], q.sort_criteria

36
vendor/plugins/acts_as_customizable/lib/acts_as_customizable.rb vendored
View File

@ -70,6 +70,12 @@ module Redmine
key = custom_field_value.custom_field_id.to_s key = custom_field_value.custom_field_id.to_s
if values.has_key?(key) if values.has_key?(key)
value = values[key] value = values[key]
if value.is_a?(Array)
value = value.reject(&:blank?).uniq
if value.empty?
value << ''
end
end
custom_field_value.value = value custom_field_value.value = value
end end
end end
@ -81,9 +87,17 @@ module Redmine
x = CustomFieldValue.new x = CustomFieldValue.new
x.custom_field = field x.custom_field = field
x.customized = self x.customized = self
cv = custom_values.detect { |v| v.custom_field == field } if field.multiple?
cv ||= custom_values.build(:customized => self, :custom_field => field, :value => nil) values = custom_values.select { |v| v.custom_field == field }
x.value = cv.value if values.empty?
values << custom_values.build(:customized => self, :custom_field => field, :value => nil)
end
x.value = values.map(&:value)
else
cv = custom_values.detect { |v| v.custom_field == field }
cv ||= custom_values.build(:customized => self, :custom_field => field, :value => nil)
x.value = cv.value
end
x x
end end
end end
@ -115,10 +129,18 @@ module Redmine
def save_custom_field_values def save_custom_field_values
target_custom_values = [] target_custom_values = []
custom_field_values.each do |custom_field_value| custom_field_values.each do |custom_field_value|
target = custom_values.detect {|cv| cv.custom_field == custom_field_value.custom_field} if custom_field_value.value.is_a?(Array)
target ||= custom_values.build(:customized => self, :custom_field => custom_field_value.custom_field) custom_field_value.value.each do |v|
target.value = custom_field_value.value target = custom_values.detect {|cv| cv.custom_field == custom_field_value.custom_field && cv.value == v}
target_custom_values << target target ||= custom_values.build(:customized => self, :custom_field => custom_field_value.custom_field, :value => v)
target_custom_values << target
end
else
target = custom_values.detect {|cv| cv.custom_field == custom_field_value.custom_field}
target ||= custom_values.build(:customized => self, :custom_field => custom_field_value.custom_field)
target.value = custom_field_value.value
target_custom_values << target
end
end end
self.custom_values = target_custom_values self.custom_values = target_custom_values
custom_values.each(&:save) custom_values.each(&:save)