jro_apps/redmine Commit - r13682:7879d8e4dcb4

Merged r14054 (#19225)....

Jean-Philippe Lang -

r13682:7879d8e4dcb4

parent child

Context file:

r13682:7879d8e4dcb4

Collapse all files

app/helpers/issues_helper.rb +13 -9

             # encoding: utf-8
             #
             # Redmine - project management software
             # Copyright (C) 2006-2015  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 IssuesHelper
               include ApplicationHelper
               include Redmine::Export::PDF::IssuesPdfHelper
               def issue_list(issues, &block)
                 ancestors = []
                 issues.each do |issue|
                   while (ancestors.any? && !issue.is_descendant_of?(ancestors.last))
                     ancestors.pop
                   end
                   yield issue, ancestors.size
                   ancestors << issue unless issue.leaf?
                 end
               end
               def grouped_issue_list(issues, query, issue_count_by_group, &block)
                 previous_group, first = false, true
                 issue_list(issues) do |issue, level|
                   group_name = group_count = nil
                   if query.grouped? && ((group = query.group_by_column.value(issue)) != previous_group || first)
                     if group.blank? && group != false
                       group_name = "(#{l(:label_blank_value)})"
                     else
                       group_name = column_content(query.group_by_column, issue)
                     end
                     group_name ||= ""
                     group_count = issue_count_by_group[group]
                   end
                   yield issue, level, group_name, group_count
                   previous_group, first = group, false
                 end
               end
               # Renders a HTML/CSS tooltip
               #
               # To use, a trigger div is needed.  This is a div with the class of "tooltip"
               # that contains this method wrapped in a span with the class of "tip"
               #
               #    <div class="tooltip"><%= link_to_issue(issue) %>
               #      <span class="tip"><%= render_issue_tooltip(issue) %></span>
               #    </div>
               #
               def render_issue_tooltip(issue)
                 @cached_label_status ||= l(:field_status)
                 @cached_label_start_date ||= l(:field_start_date)
                 @cached_label_due_date ||= l(:field_due_date)
                 @cached_label_assigned_to ||= l(:field_assigned_to)
                 @cached_label_priority ||= l(:field_priority)
                 @cached_label_project ||= l(:field_project)
                 link_to_issue(issue) + "<br /><br />".html_safe +
                   "<strong>#{@cached_label_project}</strong>: #{link_to_project(issue.project)}<br />".html_safe +
                   "<strong>#{@cached_label_status}</strong>: #{h(issue.status.name)}<br />".html_safe +
                   "<strong>#{@cached_label_start_date}</strong>: #{format_date(issue.start_date)}<br />".html_safe +
                   "<strong>#{@cached_label_due_date}</strong>: #{format_date(issue.due_date)}<br />".html_safe +
                   "<strong>#{@cached_label_assigned_to}</strong>: #{h(issue.assigned_to)}<br />".html_safe +
                   "<strong>#{@cached_label_priority}</strong>: #{h(issue.priority.name)}".html_safe
               end
               def issue_heading(issue)
                 h("#{issue.tracker} ##{issue.id}")
               end
               def render_issue_subject_with_tree(issue)
                 s = ''
                 ancestors = issue.root? ? [] : issue.ancestors.visible.to_a
                 ancestors.each do |ancestor|
                   s << '<div>' + content_tag('p', link_to_issue(ancestor, :project => (issue.project_id != ancestor.project_id)))
                 end
                 s << '<div>'
                 subject = h(issue.subject)
                 if issue.is_private?
                   subject = content_tag('span', l(:field_is_private), :class => 'private') + ' ' + subject
                 end
                 s << content_tag('h3', subject)
                 s << '</div>' * (ancestors.size + 1)
                 s.html_safe
               end
               def render_descendants_tree(issue)
                 s = '<form><table class="list issues">'
                 issue_list(issue.descendants.visible.sort_by(&:lft)) do |child, level|
                   css = "issue issue-#{child.id} hascontextmenu"
                   css << " idnt idnt-#{level}" if level > 0
                   s << content_tag('tr',
                          content_tag('td', check_box_tag("ids[]", child.id, false, :id => nil), :class => 'checkbox') +
                          content_tag('td', link_to_issue(child, :project => (issue.project_id != child.project_id)), :class => 'subject', :style => 'width: 50%') +
                          content_tag('td', h(child.status)) +
                          content_tag('td', link_to_user(child.assigned_to)) +
                          content_tag('td', progress_bar(child.done_ratio, :width => '80px')),
                          :class => css)
                 end
                 s << '</table></form>'
                 s.html_safe
               end
               # Returns an array of error messages for bulk edited issues
               def bulk_edit_error_messages(issues)
                 messages = {}
                 issues.each do |issue|
                   issue.errors.full_messages.each do |message|
                     messages[message] ||= []
                     messages[message] << issue
                   end
                 end
                 messages.map { |message, issues|
                   "#{message}: " + issues.map {|i| "##{i.id}"}.join(', ')
                 }
              end
               # Returns a link for adding a new subtask to the given issue
               def link_to_new_subtask(issue)
                 attrs = {
                   :tracker_id => issue.tracker,
                   :parent_issue_id => issue
                 }
                 link_to(l(:button_add), new_project_issue_path(issue.project, :issue => attrs))
               end
               class IssueFieldsRows
                 include ActionView::Helpers::TagHelper
                 def initialize
                   @left = []
                   @right = []
                 end
                 def left(*args)
                   args.any? ? @left << cells(*args) : @left
                 end
                 def right(*args)
                   args.any? ? @right << cells(*args) : @right
                 end
                 def size
                   @left.size > @right.size ? @left.size : @right.size
                 end
                 def to_html
                   html = ''.html_safe
                   blank = content_tag('th', '') + content_tag('td', '')
                   size.times do |i|
                     left = @left[i] || blank
                     right = @right[i] || blank
                     html << content_tag('tr', left + right)
                   end
                   html
                 end
                 def cells(label, text, options={})
                   content_tag('th', "#{label}:", options) + content_tag('td', text, options)
                 end
               end
               def issue_fields_rows
                 r = IssueFieldsRows.new
                 yield r
                 r.to_html
               end
               def render_custom_fields_rows(issue)
                 values = issue.visible_custom_field_values
                 return if values.empty?
                 ordered_values = []
                 half = (values.size / 2.0).ceil
                 half.times do |i|
                   ordered_values << values[i]
                   ordered_values << values[i + half]
                 end
                 s = "<tr>\n"
                 n = 0
                 ordered_values.compact.each do |value|
                   css = "cf_#{value.custom_field.id}"
                   s << "</tr>\n<tr>\n" if n > 0 && (n % 2) == 0
                   s << "\t<th class=\"#{css}\">#{ h(value.custom_field.name) }:</th><td class=\"#{css}\">#{ h(show_value(value)) }</td>\n"
                   n += 1
                 end
                 s << "</tr>\n"
                 s.html_safe
               end
               # Returns the path for updating the issue form
               # with project as the current project
               def update_issue_form_path(project, issue)
                 options = {:format => 'js'}
                 if issue.new_record?
                   if project
                     new_project_issue_path(project, options)
                   else
                     new_issue_path(options)
                   end
                 else
                   edit_issue_path(issue, options)
                 end
               end
               # Returns the number of descendants for an array of issues
               def issues_descendant_count(issues)
                 ids = issues.reject(&:leaf?).map {|issue| issue.descendants.ids}.flatten.uniq
                 ids -= issues.map(&:id)
                 ids.size
               end
               def issues_destroy_confirmation_message(issues)
                 issues = [issues] unless issues.is_a?(Array)
                 message = l(:text_issues_destroy_confirmation)
             		descendant_count = issues_descendant_count(issues)
                 if descendant_count > 0
                   message << "\n" + l(:text_issues_destroy_descendants_confirmation, :count => descendant_count)
                 end
                 message
               end
               # Returns an array of users that are proposed as watchers
               # on the new issue form
               def users_for_new_issue_watchers(issue)
                 users = issue.watcher_users
                 if issue.project.users.count <= 20
                   users = (users + issue.project.users.sort).uniq
                 end
                 users
               end
               def sidebar_queries
                 unless @sidebar_queries
                   @sidebar_queries = IssueQuery.visible.
                     order("#{Query.table_name}.name ASC").
                     # Project specific queries and global queries
                     where(@project.nil? ? ["project_id IS NULL"] : ["project_id IS NULL OR project_id = ?", @project.id]).
                     to_a
                 end
                 @sidebar_queries
               end
               def query_links(title, queries)
                 return '' if queries.empty?
                 # links to #index on issues/show
                 url_params = controller_name == 'issues' ? {:controller => 'issues', :action => 'index', :project_id => @project} : params
                 content_tag('h3', title) + "\n" +
                   content_tag('ul',
                     queries.collect {|query|
                         css = 'query'
                         css << ' selected' if query == @query
                         content_tag('li', link_to(query.name, url_params.merge(:query_id => query), :class => css))
                       }.join("\n").html_safe,
                     :class => 'queries'
                   ) + "\n"
               end
               def render_sidebar_queries
                 out = ''.html_safe
                 out << query_links(l(:label_my_queries), sidebar_queries.select(&:is_private?))
                 out << query_links(l(:label_query_plural), sidebar_queries.reject(&:is_private?))
                 out
               end
               def email_issue_attributes(issue, user)
                 items = []
                 %w(author status priority assigned_to category fixed_version).each do |attribute|
                   unless issue.disabled_core_fields.include?(attribute+"_id")
                     items << "#{l("field_#{attribute}")}: #{issue.send attribute}"
                   end
                 end
                 issue.visible_custom_field_values(user).each do |value|
                   items << "#{value.custom_field.name}: #{show_value(value, false)}"
                 end
                 items
               end
               def render_email_issue_attributes(issue, user, html=false)
                 items = email_issue_attributes(issue, user)
                 if html
                   content_tag('ul', items.map{|s| content_tag('li', s)}.join("\n").html_safe)
                 else
                   items.map{|s| "* #{s}"}.join("\n")
                 end
               end
               # Returns the textual representation of a journal details
               # as an array of strings
               def details_to_strings(details, no_html=false, options={})
                 options[:only_path] = (options[:only_path] == false ? false : true)
                 strings = []
                 values_by_field = {}
                 details.each do |detail|
                   if detail.property == 'cf'
                     field = detail.custom_field
                     if field && field.multiple?
                       values_by_field[field] ||= {:added => [], :deleted => []}
                       if detail.old_value
                         values_by_field[field][:deleted] << detail.old_value
                       end
                       if detail.value
                         values_by_field[field][:added] << detail.value
                       end
                       next
                     end
                   end
                   strings << show_detail(detail, no_html, options)
                 end
-                values_by_field.each do |field, changes|
+                if values_by_field.present?
-                  detail = JournalDetail.new(:property => 'cf', :prop_key => field.id.to_s)
+                  multiple_values_detail = Struct.new(:property, :prop_key, :custom_field, :old_value, :value)
-                  detail.instance_variable_set "@custom_field", field
+                  values_by_field.each do |field, changes|
-                  if changes[:added].any?
+                    if changes[:added].any?
-                    detail.value = changes[:added]
+                      detail = multiple_values_detail.new('cf', field.id.to_s, field)
-                    strings << show_detail(detail, no_html, options)
+                      detail.value = changes[:added]
-                  elsif changes[:deleted].any?
+                      strings << show_detail(detail, no_html, options)
-                    detail.old_value = changes[:deleted]
+                    end
-                    strings << show_detail(detail, no_html, options)
+                    if changes[:deleted].any?
+                      detail = multiple_values_detail.new('cf', field.id.to_s, field)
+                      detail.old_value = changes[:deleted]
+                      strings << show_detail(detail, no_html, options)
+                    end
                   end
                 end
                 strings
               end
               # Returns the textual representation of a single journal detail
               def show_detail(detail, no_html=false, options={})
                 multiple = false
                 show_diff = false
                 case detail.property
                 when 'attr'
                   field = detail.prop_key.to_s.gsub(/\_id$/, "")
                   label = l(("field_" + field).to_sym)
                   case detail.prop_key
                   when 'due_date', 'start_date'
                     value = format_date(detail.value.to_date) if detail.value
                     old_value = format_date(detail.old_value.to_date) if detail.old_value
                   when 'project_id', 'status_id', 'tracker_id', 'assigned_to_id',
                         'priority_id', 'category_id', 'fixed_version_id'
                     value = find_name_by_reflection(field, detail.value)
                     old_value = find_name_by_reflection(field, detail.old_value)
                   when 'estimated_hours'
                     value = "%0.02f" % detail.value.to_f unless detail.value.blank?
                     old_value = "%0.02f" % detail.old_value.to_f unless detail.old_value.blank?
                   when 'parent_id'
                     label = l(:field_parent_issue)
                     value = "##{detail.value}" unless detail.value.blank?
                     old_value = "##{detail.old_value}" unless detail.old_value.blank?
                   when 'is_private'
                     value = l(detail.value == "0" ? :general_text_No : :general_text_Yes) unless detail.value.blank?
                     old_value = l(detail.old_value == "0" ? :general_text_No : :general_text_Yes) unless detail.old_value.blank?
                   when 'description'
                     show_diff = true
                   end
                 when 'cf'
                   custom_field = detail.custom_field
                   if custom_field
                     label = custom_field.name
                     if custom_field.format.class.change_as_diff
                       show_diff = true
                     else
                       multiple = custom_field.multiple?
                       value = format_value(detail.value, custom_field) if detail.value
                       old_value = format_value(detail.old_value, custom_field) if detail.old_value
                     end
                   end
                 when 'attachment'
                   label = l(:label_attachment)
                 when 'relation'
                   if detail.value && !detail.old_value
                     rel_issue = Issue.visible.find_by_id(detail.value)
                     value = rel_issue.nil? ? "#{l(:label_issue)} ##{detail.value}" :
                               (no_html ? rel_issue : link_to_issue(rel_issue, :only_path => options[:only_path]))
                   elsif detail.old_value && !detail.value
                     rel_issue = Issue.visible.find_by_id(detail.old_value)
                     old_value = rel_issue.nil? ? "#{l(:label_issue)} ##{detail.old_value}" :
                                       (no_html ? rel_issue : link_to_issue(rel_issue, :only_path => options[:only_path]))
                   end
                   relation_type = IssueRelation::TYPES[detail.prop_key]
                   label = l(relation_type[:name]) if relation_type
                 end
                 call_hook(:helper_issues_show_detail_after_setting,
                           {:detail => detail, :label => label, :value => value, :old_value => old_value })
                 label ||= detail.prop_key
                 value ||= detail.value
                 old_value ||= detail.old_value
                 unless no_html
                   label = content_tag('strong', label)
                   old_value = content_tag("i", h(old_value)) if detail.old_value
                   if detail.old_value && detail.value.blank? && detail.property != 'relation'
                     old_value = content_tag("del", old_value)
                   end
                   if detail.property == 'attachment' && value.present? &&
                       atta = detail.journal.journalized.attachments.detect {|a| a.id == detail.prop_key.to_i}
                     # Link to the attachment if it has not been removed
                     value = link_to_attachment(atta, :download => true, :only_path => options[:only_path])
                     if options[:only_path] != false && atta.is_text?
                       value += link_to(
                                    image_tag('magnifier.png'),
                                    :controller => 'attachments', :action => 'show',
                                    :id => atta, :filename => atta.filename
                                  )
                     end
                   else
                     value = content_tag("i", h(value)) if value
                   end
                 end
                 if show_diff
                   s = l(:text_journal_changed_no_detail, :label => label)
                   unless no_html
                     diff_link = link_to 'diff',
                       {:controller => 'journals', :action => 'diff', :id => detail.journal_id,
                        :detail_id => detail.id, :only_path => options[:only_path]},
                       :title => l(:label_view_diff)
                     s << " (#{ diff_link })"
                   end
                   s.html_safe
                 elsif detail.value.present?
                   case detail.property
                   when 'attr', 'cf'
                     if detail.old_value.present?
                       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
                       l(:text_journal_set_to, :label => label, :value => value).html_safe
                     end
                   when 'attachment', 'relation'
                     l(:text_journal_added, :label => label, :value => value).html_safe
                   end
                 else
                   l(:text_journal_deleted, :label => label, :old => old_value).html_safe
                 end
               end
               # Find the name of an associated record stored in the field attribute
               def find_name_by_reflection(field, id)
                 unless id.present?
                   return nil
                 end
                 @detail_value_name_by_reflection ||= Hash.new do |hash, key|
                   association = Issue.reflect_on_association(key.first.to_sym)
                   name = nil
                   if association
                     record = association.klass.find_by_id(key.last)
                     if record
                       name = record.name.force_encoding('UTF-8')
                     end
                   end
                   hash[key] = name
                 end
                 @detail_value_name_by_reflection[[field, id]]
               end
               # Renders issue children recursively
               def render_api_issue_children(issue, api)
                 return if issue.leaf?
                 api.array :children do
                   issue.children.each do |child|
                     api.issue(:id => child.id) do
                       api.tracker(:id => child.tracker_id, :name => child.tracker.name) unless child.tracker.nil?
                       api.subject child.subject
                       render_api_issue_children(child, api)
                     end
                   end
                 end
               end
             end

test/unit/helpers/issues_helper_test.rb +37 0

             # Redmine - project management software
             # Copyright (C) 2006-2015  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 IssuesHelperTest < ActionView::TestCase
               include Redmine::I18n
               include IssuesHelper
               include CustomFieldsHelper
               include ERB::Util
               include Rails.application.routes.url_helpers
               fixtures :projects, :trackers, :issue_statuses, :issues,
                        :enumerations, :users, :issue_categories,
                        :projects_trackers,
                        :roles,
                        :member_roles,
                        :members,
                        :enabled_modules,
                        :custom_fields,
                        :attachments,
                        :versions
               def setup
                 super
                 set_language_if_valid('en')
                 User.current = nil
               end
               def test_issue_heading
                 assert_equal "Bug #1", issue_heading(Issue.find(1))
               end
               def test_issues_destroy_confirmation_message_with_one_root_issue
                 assert_equal l(:text_issues_destroy_confirmation),
                              issues_destroy_confirmation_message(Issue.find(1))
               end
               def test_issues_destroy_confirmation_message_with_an_arrayt_of_root_issues
                 assert_equal l(:text_issues_destroy_confirmation),
                              issues_destroy_confirmation_message(Issue.find([1, 2]))
               end
               def test_issues_destroy_confirmation_message_with_one_parent_issue
                 Issue.find(2).update_attribute :parent_issue_id, 1
                 assert_equal l(:text_issues_destroy_confirmation) + "\n" +
                                l(:text_issues_destroy_descendants_confirmation, :count => 1),
                              issues_destroy_confirmation_message(Issue.find(1))
               end
               def test_issues_destroy_confirmation_message_with_one_parent_issue_and_its_child
                 Issue.find(2).update_attribute :parent_issue_id, 1
                 assert_equal l(:text_issues_destroy_confirmation),
                              issues_destroy_confirmation_message(Issue.find([1, 2]))
               end
               def test_issues_destroy_confirmation_message_with_issues_that_share_descendants
                 root = Issue.generate!
                 child = Issue.generate!(:parent_issue_id => root.id)
                 Issue.generate!(:parent_issue_id => child.id)
                 assert_equal l(:text_issues_destroy_confirmation) + "\n" +
                                l(:text_issues_destroy_descendants_confirmation, :count => 1),
                              issues_destroy_confirmation_message([root.reload, child.reload])
               end
               test 'show_detail with no_html should show a changing attribute' do
                 detail = JournalDetail.new(:property => 'attr', :old_value => '40',
                                            :value => '100', :prop_key => 'done_ratio')
                 assert_equal "% Done changed from 40 to 100", show_detail(detail, true)
               end
               test 'show_detail with no_html should show a new attribute' do
                 detail = JournalDetail.new(:property => 'attr', :old_value => nil,
                                            :value => '100', :prop_key => 'done_ratio')
                 assert_equal "% Done set to 100", show_detail(detail, true)
               end
               test 'show_detail with no_html should show a deleted attribute' do
                 detail = JournalDetail.new(:property => 'attr', :old_value => '50',
                                            :value => nil, :prop_key => 'done_ratio')
                 assert_equal "% Done deleted (50)", show_detail(detail, true)
               end
               test 'show_detail with html should show a changing attribute with HTML highlights' do
                 detail = JournalDetail.new(:property => 'attr', :old_value => '40',
                                            :value => '100', :prop_key => 'done_ratio')
                 html = show_detail(detail, false)
                 assert_include '<strong>% Done</strong>', html
                 assert_include '<i>40</i>', html
                 assert_include '<i>100</i>', html
               end
               test 'show_detail with html should show a new attribute with HTML highlights' do
                 detail = JournalDetail.new(:property => 'attr', :old_value => nil,
                                            :value => '100', :prop_key => 'done_ratio')
                 html = show_detail(detail, false)
                 assert_include '<strong>% Done</strong>', html
                 assert_include '<i>100</i>', html
               end
               test 'show_detail with html should show a deleted attribute with HTML highlights' do
                 detail = JournalDetail.new(:property => 'attr', :old_value => '50',
                                            :value => nil, :prop_key => 'done_ratio')
                 html = show_detail(detail, false)
                 assert_include '<strong>% Done</strong>', html
                 assert_include '<del><i>50</i></del>', html
               end
               test 'show_detail with a start_date attribute should format the dates' do
                 detail = JournalDetail.new(
                            :property  => 'attr',
                            :old_value => '2010-01-01',
                            :value     => '2010-01-31',
                            :prop_key  => 'start_date'
                         )
                 with_settings :date_format => '%m/%d/%Y' do
                   assert_match "01/31/2010", show_detail(detail, true)
                   assert_match "01/01/2010", show_detail(detail, true)
                 end
               end
               test 'show_detail with a due_date attribute should format the dates' do
                 detail = JournalDetail.new(
                           :property  => 'attr',
                           :old_value => '2010-01-01',
                           :value     => '2010-01-31',
                           :prop_key  => 'due_date'
                         )
                 with_settings :date_format => '%m/%d/%Y' do
                   assert_match "01/31/2010", show_detail(detail, true)
                   assert_match "01/01/2010", show_detail(detail, true)
                 end
               end
               test 'show_detail should show old and new values with a project attribute' do
                 detail = JournalDetail.new(:property => 'attr', :prop_key => 'project_id',
                                            :old_value => 1, :value => 2)
                 assert_match 'eCookbook', show_detail(detail, true)
                 assert_match 'OnlineStore', show_detail(detail, true)
               end
               test 'show_detail should show old and new values with a issue status attribute' do
                 detail = JournalDetail.new(:property => 'attr', :prop_key => 'status_id',
                                            :old_value => 1, :value => 2)
                 assert_match 'New', show_detail(detail, true)
                 assert_match 'Assigned', show_detail(detail, true)
               end
               test 'show_detail should show old and new values with a tracker attribute' do
                 detail = JournalDetail.new(:property => 'attr', :prop_key => 'tracker_id',
                                            :old_value => 1, :value => 2)
                 assert_match 'Bug', show_detail(detail, true)
                 assert_match 'Feature request', show_detail(detail, true)
               end
               test 'show_detail should show old and new values with a assigned to attribute' do
                 detail = JournalDetail.new(:property => 'attr', :prop_key => 'assigned_to_id',
                                            :old_value => 1, :value => 2)
                 assert_match 'Redmine Admin', show_detail(detail, true)
                 assert_match 'John Smith', show_detail(detail, true)
               end
               test 'show_detail should show old and new values with a priority attribute' do
                 detail = JournalDetail.new(:property => 'attr', :prop_key => 'priority_id',
                                            :old_value => 4, :value => 5)
                 assert_match 'Low', show_detail(detail, true)
                 assert_match 'Normal', show_detail(detail, true)
               end
               test 'show_detail should show old and new values with a category attribute' do
                 detail = JournalDetail.new(:property => 'attr', :prop_key => 'category_id',
                                            :old_value => 1, :value => 2)
                 assert_match 'Printing', show_detail(detail, true)
                 assert_match 'Recipes', show_detail(detail, true)
               end
               test 'show_detail should show old and new values with a fixed version attribute' do
                 detail = JournalDetail.new(:property => 'attr', :prop_key => 'fixed_version_id',
                                            :old_value => 1, :value => 2)
                 assert_match '0.1', show_detail(detail, true)
                 assert_match '1.0', show_detail(detail, true)
               end
               test 'show_detail should show old and new values with a estimated hours attribute' do
                 detail = JournalDetail.new(:property => 'attr', :prop_key => 'estimated_hours',
                                            :old_value => '5', :value => '6.3')
                 assert_match '5.00', show_detail(detail, true)
                 assert_match '6.30', show_detail(detail, true)
               end
               test 'show_detail should not show values with a description attribute' do
                 detail = JournalDetail.new(:property => 'attr', :prop_key => 'description',
                                            :old_value => 'Foo', :value => 'Bar')
                 assert_equal 'Description updated', show_detail(detail, true)
               end
               test 'show_detail should show old and new values with a custom field' do
                 detail = JournalDetail.new(:property => 'cf', :prop_key => '1',
                                            :old_value => 'MySQL', :value => 'PostgreSQL')
                 assert_equal 'Database changed from MySQL to PostgreSQL', show_detail(detail, true)
               end
               test 'show_detail should not show values with a long text custom field' do
                 field = IssueCustomField.create!(:name => "Long field", :field_format => 'text')
                 detail = JournalDetail.new(:property => 'cf', :prop_key => field.id,
                                            :old_value => 'Foo', :value => 'Bar')
                 assert_equal 'Long field updated', show_detail(detail, true)
               end
               test 'show_detail should show added file' do
                 detail = JournalDetail.new(:property => 'attachment', :prop_key => '1',
                                            :old_value => nil, :value => 'error281.txt')
                 assert_match 'error281.txt', show_detail(detail, true)
               end
               test 'show_detail should show removed file' do
                 detail = JournalDetail.new(:property => 'attachment', :prop_key => '1',
                                            :old_value => 'error281.txt', :value => nil)
                 assert_match 'error281.txt', show_detail(detail, true)
               end
               def test_show_detail_relation_added
                 detail = JournalDetail.new(:property => 'relation',
                                            :prop_key => 'precedes',
                                            :value    => 1)
                 assert_equal "Precedes Bug #1: Cannot print recipes added", show_detail(detail, true)
                 str = link_to("Bug #1", "/issues/1", :class => Issue.find(1).css_classes)
                 assert_equal "<strong>Precedes</strong> <i>#{str}: Cannot print recipes</i> added",
                               show_detail(detail, false)
               end
               def test_show_detail_relation_added_with_inexistant_issue
                 inexistant_issue_number = 9999
                 assert_nil  Issue.find_by_id(inexistant_issue_number)
                 detail = JournalDetail.new(:property => 'relation',
                                            :prop_key => 'precedes',
                                            :value    => inexistant_issue_number)
                 assert_equal "Precedes Issue ##{inexistant_issue_number} added", show_detail(detail, true)
                 assert_equal "<strong>Precedes</strong> <i>Issue ##{inexistant_issue_number}</i> added", show_detail(detail, false)
               end
               def test_show_detail_relation_added_should_not_disclose_issue_that_is_not_visible
                 issue = Issue.generate!(:is_private => true)
                 detail = JournalDetail.new(:property => 'relation',
                                            :prop_key => 'precedes',
                                            :value    => issue.id)
                 assert_equal "Precedes Issue ##{issue.id} added", show_detail(detail, true)
                 assert_equal "<strong>Precedes</strong> <i>Issue ##{issue.id}</i> added", show_detail(detail, false)
               end
               def test_show_detail_relation_deleted
                 detail = JournalDetail.new(:property  => 'relation',
                                            :prop_key  => 'precedes',
                                            :old_value => 1)
                 assert_equal "Precedes deleted (Bug #1: Cannot print recipes)", show_detail(detail, true)
                 str = link_to("Bug #1",
                               "/issues/1",
                               :class => Issue.find(1).css_classes)
                 assert_equal "<strong>Precedes</strong> deleted (<i>#{str}: Cannot print recipes</i>)",
                              show_detail(detail, false)
               end
               def test_show_detail_relation_deleted_with_inexistant_issue
                 inexistant_issue_number = 9999
                 assert_nil  Issue.find_by_id(inexistant_issue_number)
                 detail = JournalDetail.new(:property  => 'relation',
                                            :prop_key  => 'precedes',
                                            :old_value => inexistant_issue_number)
                 assert_equal "Precedes deleted (Issue #9999)", show_detail(detail, true)
                 assert_equal "<strong>Precedes</strong> deleted (<i>Issue #9999</i>)", show_detail(detail, false)
               end
               def test_show_detail_relation_deleted_should_not_disclose_issue_that_is_not_visible
                 issue = Issue.generate!(:is_private => true)
                 detail = JournalDetail.new(:property => 'relation',
                                            :prop_key => 'precedes',
                                            :old_value    => issue.id)
                 assert_equal "Precedes deleted (Issue ##{issue.id})", show_detail(detail, true)
                 assert_equal "<strong>Precedes</strong> deleted (<i>Issue ##{issue.id}</i>)", show_detail(detail, false)
               end
+              def test_details_to_strings_with_multiple_values_removed_from_custom_field
+                field = IssueCustomField.generate!(:name => 'User', :field_format => 'user', :multiple => true)
+                details = []
+                details << JournalDetail.new(:property => 'cf', :prop_key => field.id.to_s, :old_value => '1', :value => nil)
+                details << JournalDetail.new(:property => 'cf', :prop_key => field.id.to_s, :old_value => '3', :value => nil)
+                assert_equal ["User deleted (Dave Lopper, Redmine Admin)"], details_to_strings(details, true)
+                assert_equal ["<strong>User</strong> deleted (<del><i>Dave Lopper, Redmine Admin</i></del>)"], details_to_strings(details, false)
+              end
+              def test_details_to_strings_with_multiple_values_added_to_custom_field
+                field = IssueCustomField.generate!(:name => 'User', :field_format => 'user', :multiple => true)
+                details = []
+                details << JournalDetail.new(:property => 'cf', :prop_key => field.id.to_s, :old_value => nil, :value => '1')
+                details << JournalDetail.new(:property => 'cf', :prop_key => field.id.to_s, :old_value => nil, :value => '3')
+                assert_equal ["User Dave Lopper, Redmine Admin added"], details_to_strings(details, true)
+                assert_equal ["<strong>User</strong> <i>Dave Lopper, Redmine Admin</i> added"], details_to_strings(details, false)
+              end
+              def test_details_to_strings_with_multiple_values_added_and_removed_from_custom_field
+                field = IssueCustomField.generate!(:name => 'User', :field_format => 'user', :multiple => true)
+                details = []
+                details << JournalDetail.new(:property => 'cf', :prop_key => field.id.to_s, :old_value => nil, :value => '1')
+                details << JournalDetail.new(:property => 'cf', :prop_key => field.id.to_s, :old_value => '2', :value => nil)
+                details << JournalDetail.new(:property => 'cf', :prop_key => field.id.to_s, :old_value => '3', :value => nil)
+                assert_equal [
+                  "User Redmine Admin added",
+                  "User deleted (Dave Lopper, John Smith)"
+                  ], details_to_strings(details, true)
+                assert_equal [
+                  "<strong>User</strong> <i>Redmine Admin</i> added",
+                  "<strong>User</strong> deleted (<del><i>Dave Lopper, John Smith</i></del>)"
+                  ], details_to_strings(details, false)
+              end
               def test_find_name_by_reflection_should_return_nil_for_missing_record
                 assert_nil find_name_by_reflection('status', 99)
               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