jro_apps/redmine Commit - r11655:1f9e1ca3181b

add journal after creating/deleting issue relation (#1005)...

Toshi MARUYAMA -

r11655:1f9e1ca3181b

parent child

Context file:

r11655:1f9e1ca3181b

Collapse all files

app/helpers/issues_helper.rb +12 -1

             # encoding: utf-8
             #
             # Redmine - project management software
             # Copyright (C) 2006-2013  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
               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
               # 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.all
                 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, :truncate => 60, :project => (issue.project_id != child.project_id)), :class => 'subject') +
                          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)
                 return if issue.custom_field_values.empty?
                 ordered_values = []
                 half = (issue.custom_field_values.size / 2.0).ceil
                 half.times do |i|
                   ordered_values << issue.custom_field_values[i]
                   ordered_values << issue.custom_field_values[i + half]
                 end
                 s = "<tr>\n"
                 n = 0
                 ordered_values.compact.each do |value|
                   s << "</tr>\n<tr>\n" if n > 0 && (n % 2) == 0
                   s << "\t<th>#{ h(value.custom_field.name) }:</th><td>#{ simple_format_without_paragraph(h(show_value(value))) }</td>\n"
                   n += 1
                 end
                 s << "</tr>\n"
                 s.html_safe
               end
               def issues_destroy_confirmation_message(issues)
                 issues = [issues] unless issues.is_a?(Array)
                 message = l(:text_issues_destroy_confirmation)
                 descendant_count = issues.inject(0) {|memo, i| memo += (i.right - i.left - 1)/2}
                 if descendant_count > 0
                   issues.each do |issue|
                     next if issue.root?
                     issues.each do |other_issue|
                       descendant_count -= 1 if issue.is_descendant_of?(other_issue)
                     end
                   end
                   if descendant_count > 0
                     message << "\n" + l(:text_issues_destroy_descendants_confirmation, :count => descendant_count)
                   end
                 end
                 message
               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]).
                     all
                 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.reject(&:is_public?))
                 out << query_links(l(:label_query_plural), sidebar_queries.select(&:is_public?))
                 out
               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_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, options)
                 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, options)
                   elsif changes[:deleted].any?
                     detail.old_value = changes[:deleted]
                     strings << show_detail(detail, no_html, options)
                   end
                 end
                 strings
               end
               # Returns the textual representation of a single journal detail
               def show_detail(detail, no_html=false, options={})
                 multiple = 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?
                   end
                 when 'cf'
                   custom_field = CustomField.find_by_id(detail.prop_key)
                   if custom_field
                     multiple = custom_field.multiple?
                     label = custom_field.name
                     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
                   end
                 when 'attachment'
                   label = l(:label_attachment)
+                when 'relation'
+                  if detail.value && !detail.old_value
+                    rel_issue = Issue.find_by_id(detail.value)
+                    value = rel_issue.nil? ? "#{l(:label_issue)} #{detail.value}" :
+                              (no_html ? rel_issue : link_to_issue(rel_issue))
+                  elsif detail.old_value && !detail.value
+                    rel_issue = Issue.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))
+                  end
+                  label = l(detail.prop_key.to_sym)
                 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
                   old_value = content_tag("del", old_value) if detail.old_value and detail.value.blank?
                   if detail.property == 'attachment' && !value.blank? && atta = Attachment.find_by_id(detail.prop_key)
                     # 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 detail.property == 'attr' && detail.prop_key == 'description'
                   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'
+                  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
                 association = Issue.reflect_on_association(field.to_sym)
                 if association
                   record = association.class_name.constantize.find_by_id(id)
                   if record
                     record.name.force_encoding('UTF-8') if record.name.respond_to?(:force_encoding)
                     return record.name
                   end
                 end
               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

app/models/issue_relation.rb +28 0

             # Redmine - project management software
             # Copyright (C) 2006-2013  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 IssueRelation < ActiveRecord::Base
               # Class used to represent the relations of an issue
               class Relations < Array
                 include Redmine::I18n
                 def initialize(issue, *args)
                   @issue = issue
                   super(*args)
                 end
                 def to_s(*args)
                   map {|relation| "#{l(relation.label_for(@issue))} ##{relation.other_issue(@issue).id}"}.join(', ')
                 end
               end
               belongs_to :issue_from, :class_name => 'Issue', :foreign_key => 'issue_from_id'
               belongs_to :issue_to, :class_name => 'Issue', :foreign_key => 'issue_to_id'
               TYPE_RELATES      = "relates"
               TYPE_DUPLICATES   = "duplicates"
               TYPE_DUPLICATED   = "duplicated"
               TYPE_BLOCKS       = "blocks"
               TYPE_BLOCKED      = "blocked"
               TYPE_PRECEDES     = "precedes"
               TYPE_FOLLOWS      = "follows"
               TYPE_COPIED_TO    = "copied_to"
               TYPE_COPIED_FROM  = "copied_from"
               TYPES = {
                 TYPE_RELATES =>     { :name => :label_relates_to, :sym_name => :label_relates_to,
                                       :order => 1, :sym => TYPE_RELATES },
                 TYPE_DUPLICATES =>  { :name => :label_duplicates, :sym_name => :label_duplicated_by,
                                       :order => 2, :sym => TYPE_DUPLICATED },
                 TYPE_DUPLICATED =>  { :name => :label_duplicated_by, :sym_name => :label_duplicates,
                                       :order => 3, :sym => TYPE_DUPLICATES, :reverse => TYPE_DUPLICATES },
                 TYPE_BLOCKS =>      { :name => :label_blocks, :sym_name => :label_blocked_by,
                                       :order => 4, :sym => TYPE_BLOCKED },
                 TYPE_BLOCKED =>     { :name => :label_blocked_by, :sym_name => :label_blocks,
                                       :order => 5, :sym => TYPE_BLOCKS, :reverse => TYPE_BLOCKS },
                 TYPE_PRECEDES =>    { :name => :label_precedes, :sym_name => :label_follows,
                                       :order => 6, :sym => TYPE_FOLLOWS },
                 TYPE_FOLLOWS =>     { :name => :label_follows, :sym_name => :label_precedes,
                                       :order => 7, :sym => TYPE_PRECEDES, :reverse => TYPE_PRECEDES },
                 TYPE_COPIED_TO =>   { :name => :label_copied_to, :sym_name => :label_copied_from,
                                       :order => 8, :sym => TYPE_COPIED_FROM },
                 TYPE_COPIED_FROM => { :name => :label_copied_from, :sym_name => :label_copied_to,
                                       :order => 9, :sym => TYPE_COPIED_TO, :reverse => TYPE_COPIED_TO }
               }.freeze
               validates_presence_of :issue_from, :issue_to, :relation_type
               validates_inclusion_of :relation_type, :in => TYPES.keys
               validates_numericality_of :delay, :allow_nil => true
               validates_uniqueness_of :issue_to_id, :scope => :issue_from_id
               validate :validate_issue_relation
               attr_protected :issue_from_id, :issue_to_id
               before_save :handle_issue_order
+              after_create  :create_journal_after_create
+              after_destroy :create_journal_after_delete
               def visible?(user=User.current)
                 (issue_from.nil? || issue_from.visible?(user)) && (issue_to.nil? || issue_to.visible?(user))
               end
               def deletable?(user=User.current)
                 visible?(user) &&
                   ((issue_from.nil? || user.allowed_to?(:manage_issue_relations, issue_from.project)) ||
                     (issue_to.nil? || user.allowed_to?(:manage_issue_relations, issue_to.project)))
               end
               def initialize(attributes=nil, *args)
                 super
                 if new_record?
                   if relation_type.blank?
                     self.relation_type = IssueRelation::TYPE_RELATES
                   end
                 end
               end
               def validate_issue_relation
                 if issue_from && issue_to
                   errors.add :issue_to_id, :invalid if issue_from_id == issue_to_id
                   unless issue_from.project_id == issue_to.project_id ||
                             Setting.cross_project_issue_relations?
                     errors.add :issue_to_id, :not_same_project
                   end
                   # detect circular dependencies depending wether the relation should be reversed
                   if TYPES.has_key?(relation_type) && TYPES[relation_type][:reverse]
                     errors.add :base, :circular_dependency if issue_from.all_dependent_issues.include? issue_to
                   else
                     errors.add :base, :circular_dependency if issue_to.all_dependent_issues.include? issue_from
                   end
                   if issue_from.is_descendant_of?(issue_to) || issue_from.is_ancestor_of?(issue_to)
                     errors.add :base, :cant_link_an_issue_with_a_descendant
                   end
                 end
               end
               def other_issue(issue)
                 (self.issue_from_id == issue.id) ? issue_to : issue_from
               end
               # Returns the relation type for +issue+
               def relation_type_for(issue)
                 if TYPES[relation_type]
                   if self.issue_from_id == issue.id
                     relation_type
                   else
                     TYPES[relation_type][:sym]
                   end
                 end
               end
               def label_for(issue)
                 TYPES[relation_type] ?
                     TYPES[relation_type][(self.issue_from_id == issue.id) ? :name : :sym_name] :
                     :unknow
               end
               def css_classes_for(issue)
                 "rel-#{relation_type_for(issue)}"
               end
               def handle_issue_order
                 reverse_if_needed
                 if TYPE_PRECEDES == relation_type
                   self.delay ||= 0
                 else
                   self.delay = nil
                 end
                 set_issue_to_dates
               end
               def set_issue_to_dates
                 soonest_start = self.successor_soonest_start
                 if soonest_start && issue_to
                   issue_to.reschedule_on!(soonest_start)
                 end
               end
               def successor_soonest_start
                 if (TYPE_PRECEDES == self.relation_type) && delay && issue_from &&
                        (issue_from.start_date || issue_from.due_date)
                   (issue_from.due_date || issue_from.start_date) + 1 + delay
                 end
               end
               def <=>(relation)
                 r = TYPES[self.relation_type][:order] <=> TYPES[relation.relation_type][:order]
                 r == 0 ? id <=> relation.id : r
               end
               private
               # Reverses the relation if needed so that it gets stored in the proper way
               # Should not be reversed before validation so that it can be displayed back
               # as entered on new relation form
               def reverse_if_needed
                 if TYPES.has_key?(relation_type) && TYPES[relation_type][:reverse]
                   issue_tmp = issue_to
                   self.issue_to = issue_from
                   self.issue_from = issue_tmp
                   self.relation_type = TYPES[relation_type][:reverse]
                 end
               end
+              def create_journal_after_create
+                journal = issue_from.init_journal(User.current)
+                journal.details << JournalDetail.new(:property => 'relation',
+                                                     :prop_key => label_for(issue_from).to_s,
+                                                     :value    => issue_to.id)
+                journal.save
+                journal = issue_to.init_journal(User.current)
+                journal.details << JournalDetail.new(:property => 'relation',
+                                                     :prop_key => label_for(issue_to).to_s,
+                                                     :value    => issue_from.id)
+                journal.save
+              end
+              def create_journal_after_delete
+                journal = issue_from.init_journal(User.current)
+                journal.details << JournalDetail.new(:property  => 'relation',
+                                                     :prop_key  => label_for(issue_from).to_s,
+                                                     :old_value => issue_to.id)
+                journal.save
+                journal = issue_to.init_journal(User.current)
+                journal.details << JournalDetail.new(:property  => 'relation',
+                                                     :prop_key  => label_for(issue_to).to_s,
+                                                     :old_value => issue_from.id)
+                journal.save
+              end
             end

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

             # Redmine - project management software
             # Copyright (C) 2006-2013  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 ApplicationHelper
               include Redmine::I18n
               include IssuesHelper
               include CustomFieldsHelper
               include ERB::Util
               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
               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 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 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_create_relation
+                detail = JournalDetail.new(:property => 'relation',
+                                           :prop_key => 'label_precedes',
+                                           :value    => 1)
+                assert_equal "Precedes Bug #1: Can't print recipes added", show_detail(detail, true)
+                assert_match %r{<strong>Precedes</strong> <i><a href="/issues/1" class=".+">Bug #1</a>: Can&#x27;t print recipes</i> added},
+                             show_detail(detail, false)
+                non_existed_issue_number = 9999
+                assert_nil  Issue.find_by_id(non_existed_issue_number)
+                detail = JournalDetail.new(:property => 'relation',
+                                           :prop_key => 'label_precedes',
+                                           :value    => non_existed_issue_number)
+                assert_equal "Precedes Issue #{non_existed_issue_number} added", show_detail(detail, true)
+                assert_equal "<strong>Precedes</strong> <i>Issue #{non_existed_issue_number}</i> added", show_detail(detail, false)
+              end
+              def test_show_detail_delete_relation
+                detail = JournalDetail.new(:property  => 'relation',
+                                           :prop_key  => 'label_precedes',
+                                           :old_value => 1)
+                assert_equal "Precedes deleted (Bug #1: Can't print recipes)", show_detail(detail, true)
+                assert_match %r{<strong>Precedes</strong> deleted \(<del><i><a href="/issues/1" class=".+">Bug #1</a>: Can&#x27;t print recipes</i></del>\)},
+                             show_detail(detail, false)
+                non_existed_issue_number = 9999
+                assert_nil  Issue.find_by_id(non_existed_issue_number)
+                detail = JournalDetail.new(:property  => 'relation',
+                                           :prop_key  => 'label_precedes',
+                                           :old_value => non_existed_issue_number)
+                assert_equal "Precedes deleted (Issue 9999)", show_detail(detail, true)
+                assert_equal "<strong>Precedes</strong> deleted (<del><i>Issue 9999</i></del>)", show_detail(detail, false)
+              end
             end

test/unit/issue_relation_test.rb +45 0

             # Redmine - project management software
             # Copyright (C) 2006-2013  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 IssueRelationTest < ActiveSupport::TestCase
               fixtures :projects,
                        :users,
                        :roles,
                        :members,
                        :member_roles,
                        :issues,
                        :issue_statuses,
                        :issue_relations,
                        :enabled_modules,
                        :enumerations,
                        :trackers
               include Redmine::I18n
               def test_create
                 from = Issue.find(1)
                 to = Issue.find(2)
                 relation = IssueRelation.new :issue_from => from, :issue_to => to,
                                              :relation_type => IssueRelation::TYPE_PRECEDES
                 assert relation.save
                 relation.reload
                 assert_equal IssueRelation::TYPE_PRECEDES, relation.relation_type
                 assert_equal from, relation.issue_from
                 assert_equal to, relation.issue_to
               end
               def test_create_minimum
                 relation = IssueRelation.new :issue_from => Issue.find(1), :issue_to => Issue.find(2)
                 assert relation.save
                 assert_equal IssueRelation::TYPE_RELATES, relation.relation_type
               end
               def test_follows_relation_should_be_reversed
                 from = Issue.find(1)
                 to = Issue.find(2)
                 relation = IssueRelation.new :issue_from => from, :issue_to => to,
                                              :relation_type => IssueRelation::TYPE_FOLLOWS
                 assert relation.save
                 relation.reload
                 assert_equal IssueRelation::TYPE_PRECEDES, relation.relation_type
                 assert_equal to, relation.issue_from
                 assert_equal from, relation.issue_to
               end
               def test_follows_relation_should_not_be_reversed_if_validation_fails
                 from = Issue.find(1)
                 to = Issue.find(2)
                 relation = IssueRelation.new :issue_from => from, :issue_to => to,
                                              :relation_type => IssueRelation::TYPE_FOLLOWS,
                                              :delay => 'xx'
                 assert !relation.save
                 assert_equal IssueRelation::TYPE_FOLLOWS, relation.relation_type
                 assert_equal from, relation.issue_from
                 assert_equal to, relation.issue_to
               end
               def test_relation_type_for
                 from = Issue.find(1)
                 to = Issue.find(2)
                 relation = IssueRelation.new :issue_from => from, :issue_to => to,
                                              :relation_type => IssueRelation::TYPE_PRECEDES
                 assert_equal IssueRelation::TYPE_PRECEDES, relation.relation_type_for(from)
                 assert_equal IssueRelation::TYPE_FOLLOWS, relation.relation_type_for(to)
               end
               def test_set_issue_to_dates_without_issue_to
                 r = IssueRelation.new(:issue_from => Issue.new(:start_date => Date.today),
                                       :relation_type => IssueRelation::TYPE_PRECEDES,
                                       :delay => 1)
                 assert_nil r.set_issue_to_dates
               end
               def test_set_issue_to_dates_without_issues
                 r = IssueRelation.new(:relation_type => IssueRelation::TYPE_PRECEDES, :delay => 1)
                 assert_nil r.set_issue_to_dates
               end
               def test_validates_circular_dependency
                 IssueRelation.delete_all
                 assert IssueRelation.create!(
                          :issue_from => Issue.find(1), :issue_to => Issue.find(2),
                          :relation_type => IssueRelation::TYPE_PRECEDES
                        )
                 assert IssueRelation.create!(
                          :issue_from => Issue.find(2), :issue_to => Issue.find(3),
                          :relation_type => IssueRelation::TYPE_PRECEDES
                        )
                 r = IssueRelation.new(
                       :issue_from => Issue.find(3), :issue_to => Issue.find(1),
                       :relation_type => IssueRelation::TYPE_PRECEDES
                     )
                 assert !r.save
                 assert_not_nil r.errors[:base]
               end
               def test_validates_circular_dependency_of_subtask
                 set_language_if_valid 'en'
                 issue1 = Issue.generate!
                 issue2 = Issue.generate!
                 IssueRelation.create!(
                   :issue_from => issue1, :issue_to => issue2,
                   :relation_type => IssueRelation::TYPE_PRECEDES
                 )
                 child = Issue.generate!(:parent_issue_id => issue2.id)
                 issue1.reload
                 child.reload
                 r = IssueRelation.new(
                       :issue_from => child, :issue_to => issue1,
                       :relation_type => IssueRelation::TYPE_PRECEDES
                     )
                 assert !r.save
                 assert_include 'This relation would create a circular dependency', r.errors.full_messages
               end
               def test_subtasks_should_allow_precedes_relation
                 parent = Issue.generate!
                 child1 = Issue.generate!(:parent_issue_id => parent.id)
                 child2 = Issue.generate!(:parent_issue_id => parent.id)
                 r = IssueRelation.new(
                       :issue_from => child1, :issue_to => child2,
                       :relation_type => IssueRelation::TYPE_PRECEDES
                     )
                 assert r.valid?
                 assert r.save
               end
               def test_validates_circular_dependency_on_reverse_relations
                 IssueRelation.delete_all
                 assert IssueRelation.create!(
                          :issue_from => Issue.find(1), :issue_to => Issue.find(3),
                          :relation_type => IssueRelation::TYPE_BLOCKS
                        )
                 assert IssueRelation.create!(
                          :issue_from => Issue.find(1), :issue_to => Issue.find(2),
                          :relation_type => IssueRelation::TYPE_BLOCKED
                        )
                 r = IssueRelation.new(
                       :issue_from => Issue.find(2), :issue_to => Issue.find(1),
                       :relation_type => IssueRelation::TYPE_BLOCKED
                     )
                 assert !r.save
                 assert_not_nil r.errors[:base]
               end
+              def test_create_should_make_journal_entry
+                from = Issue.find(1)
+                to   = Issue.find(2)
+                from_journals = from.journals.size
+                to_journals   = to.journals.size
+                relation = IssueRelation.new(:issue_from => from, :issue_to => to,
+                                             :relation_type => IssueRelation::TYPE_PRECEDES)
+                assert relation.save
+                from.reload
+                to.reload
+                relation.reload
+                assert_equal from.journals.size, (from_journals + 1)
+                assert_equal to.journals.size, (to_journals + 1)
+                assert_equal 'relation', from.journals.last.details.last.property
+                assert_equal 'label_precedes', from.journals.last.details.last.prop_key
+                assert_equal '2', from.journals.last.details.last.value
+                assert_nil   from.journals.last.details.last.old_value
+                assert_equal 'relation', to.journals.last.details.last.property
+                assert_equal 'label_follows', to.journals.last.details.last.prop_key
+                assert_equal '1', to.journals.last.details.last.value
+                assert_nil   to.journals.last.details.last.old_value
+              end
+              def test_delete_should_make_journal_entry
+                relation = IssueRelation.find(1)
+                id = relation.id
+                from = relation.issue_from
+                to   = relation.issue_to
+                from_journals = from.journals.size
+                to_journals   = to.journals.size
+                assert relation.destroy
+                from.reload
+                to.reload
+                assert_equal from.journals.size, (from_journals + 1)
+                assert_equal to.journals.size, (to_journals + 1)
+                assert_equal 'relation', from.journals.last.details.last.property
+                assert_equal 'label_blocks', from.journals.last.details.last.prop_key
+                assert_equal '9', from.journals.last.details.last.old_value
+                assert_nil   from.journals.last.details.last.value
+                assert_equal 'relation', to.journals.last.details.last.property
+                assert_equal 'label_blocked_by', to.journals.last.details.last.prop_key
+                assert_equal '10', to.journals.last.details.last.old_value
+                assert_nil   to.journals.last.details.last.value
+              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