jro_apps/redmine Commit - r13887:0ad09e3aef86

Adds settings to control start/due dates and priority on parent tasks (#5490)....

Jean-Philippe Lang -

r13887:0ad09e3aef86

parent child

Context file:

r13887:0ad09e3aef86

Collapse all files

test/unit/issue_subtasking_test.rb created 644 +146 0

@@ -0,0 +1,146
	1	# Redmine - project management software
	2	# Copyright (C) 2006-2015 Jean-Philippe Lang
	3	#
	4	# This program is free software; you can redistribute it and/or
	5	# modify it under the terms of the GNU General Public License
	6	# as published by the Free Software Foundation; either version 2
	7	# of the License, or (at your option) any later version.
	8	#
	9	# This program is distributed in the hope that it will be useful,
	10	# but WITHOUT ANY WARRANTY; without even the implied warranty of
	11	# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	12	# GNU General Public License for more details.
	13	#
	14	# You should have received a copy of the GNU General Public License
	15	# along with this program; if not, write to the Free Software
	16	# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
	17
	18	require File.expand_path('../../test_helper', __FILE__)
	19
	20	class IssueSubtaskingTest < ActiveSupport::TestCase
	21	fixtures :projects, :users, :roles, :members, :member_roles,
	22	:trackers, :projects_trackers,
	23	:issue_statuses, :issue_categories, :enumerations,
	24	:issues
	25
	26	def test_leaf_planning_fields_should_be_editable
	27	issue = Issue.generate!
	28	user = User.find(1)
	29	%w(priority_id done_ratio start_date due_date estimated_hours).each do \|attribute\|
	30	assert issue.safe_attribute?(attribute, user)
	31	end
	32	end
	33
	34	def test_parent_dates_should_be_read_only_with_parent_issue_dates_set_to_derived
	35	with_settings :parent_issue_dates => 'derived' do
	36	issue = Issue.generate_with_child!
	37	user = User.find(1)
	38	%w(start_date due_date).each do \|attribute\|
	39	assert !issue.safe_attribute?(attribute, user)
	40	end
	41	end
	42	end
	43
	44	def test_parent_dates_should_be_lowest_start_and_highest_due_dates_with_parent_issue_dates_set_to_derived
	45	with_settings :parent_issue_dates => 'derived' do
	46	parent = Issue.generate!
	47	parent.generate_child!(:start_date => '2010-01-25', :due_date => '2010-02-15')
	48	parent.generate_child!( :due_date => '2010-02-13')
	49	parent.generate_child!(:start_date => '2010-02-01', :due_date => '2010-02-22')
	50	parent.reload
	51	assert_equal Date.parse('2010-01-25'), parent.start_date
	52	assert_equal Date.parse('2010-02-22'), parent.due_date
	53	end
	54	end
	55
	56	def test_reschuling_a_parent_should_reschedule_subtasks_with_parent_issue_dates_set_to_derived
	57	with_settings :parent_issue_dates => 'derived' do
	58	parent = Issue.generate!
	59	c1 = parent.generate_child!(:start_date => '2010-05-12', :due_date => '2010-05-18')
	60	c2 = parent.generate_child!(:start_date => '2010-06-03', :due_date => '2010-06-10')
	61	parent.reload.reschedule_on!(Date.parse('2010-06-02'))
	62	c1.reload
	63	assert_equal [Date.parse('2010-06-02'), Date.parse('2010-06-08')], [c1.start_date, c1.due_date]
	64	c2.reload
	65	assert_equal [Date.parse('2010-06-03'), Date.parse('2010-06-10')], [c2.start_date, c2.due_date] # no change
	66	parent.reload
	67	assert_equal [Date.parse('2010-06-02'), Date.parse('2010-06-10')], [parent.start_date, parent.due_date]
	68	end
	69	end
	70
	71	def test_parent_priority_should_be_read_only_with_parent_issue_priority_set_to_derived
	72	with_settings :parent_issue_priority => 'derived' do
	73	issue = Issue.generate_with_child!
	74	user = User.find(1)
	75	assert !issue.safe_attribute?('priority_id', user)
	76	end
	77	end
	78
	79	def test_parent_priority_should_be_the_highest_child_priority
	80	with_settings :parent_issue_priority => 'derived' do
	81	parent = Issue.generate!(:priority => IssuePriority.find_by_name('Normal'))
	82	# Create children
	83	child1 = parent.generate_child!(:priority => IssuePriority.find_by_name('High'))
	84	assert_equal 'High', parent.reload.priority.name
	85	child2 = child1.generate_child!(:priority => IssuePriority.find_by_name('Immediate'))
	86	assert_equal 'Immediate', child1.reload.priority.name
	87	assert_equal 'Immediate', parent.reload.priority.name
	88	child3 = parent.generate_child!(:priority => IssuePriority.find_by_name('Low'))
	89	assert_equal 'Immediate', parent.reload.priority.name
	90	# Destroy a child
	91	child1.destroy
	92	assert_equal 'Low', parent.reload.priority.name
	93	# Update a child
	94	child3.reload.priority = IssuePriority.find_by_name('Normal')
	95	child3.save!
	96	assert_equal 'Normal', parent.reload.priority.name
	97	end
	98	end
	99
	100	def test_parent_dates_should_be_editable_with_parent_issue_dates_set_to_independent
	101	with_settings :parent_issue_dates => 'independent' do
	102	issue = Issue.generate_with_child!
	103	user = User.find(1)
	104	%w(start_date due_date).each do \|attribute\|
	105	assert issue.safe_attribute?(attribute, user)
	106	end
	107	end
	108	end
	109
	110	def test_parent_dates_should_not_be_updated_with_parent_issue_dates_set_to_independent
	111	with_settings :parent_issue_dates => 'independent' do
	112	parent = Issue.generate!(:start_date => '2015-07-01', :due_date => '2015-08-01')
	113	parent.generate_child!(:start_date => '2015-06-01', :due_date => '2015-09-01')
	114	parent.reload
	115	assert_equal Date.parse('2015-07-01'), parent.start_date
	116	assert_equal Date.parse('2015-08-01'), parent.due_date
	117	end
	118	end
	119
	120	def test_reschuling_a_parent_should_not_reschedule_subtasks_with_parent_issue_dates_set_to_independent
	121	with_settings :parent_issue_dates => 'independent' do
	122	parent = Issue.generate!(:start_date => '2010-05-01', :due_date => '2010-05-20')
	123	c1 = parent.generate_child!(:start_date => '2010-05-12', :due_date => '2010-05-18')
	124	parent.reload.reschedule_on!(Date.parse('2010-06-01'))
	125	assert_equal Date.parse('2010-06-01'), parent.reload.start_date
	126	c1.reload
	127	assert_equal [Date.parse('2010-05-12'), Date.parse('2010-05-18')], [c1.start_date, c1.due_date]
	128	end
	129	end
	130
	131	def test_parent_priority_should_be_editable_with_parent_issue_priority_set_to_independent
	132	with_settings :parent_issue_priority => 'independent' do
	133	issue = Issue.generate_with_child!
	134	user = User.find(1)
	135	assert issue.safe_attribute?('priority_id', user)
	136	end
	137	end
	138
	139	def test_parent_priority_should_not_be_updated_with_parent_issue_priority_set_to_independent
	140	with_settings :parent_issue_priority => 'independent' do
	141	parent = Issue.generate!(:priority => IssuePriority.find_by_name('Normal'))
	142	child1 = parent.generate_child!(:priority => IssuePriority.find_by_name('High'))
	143	assert_equal 'Normal', parent.reload.priority.name
	144	end
	145	end
	146	end

app/helpers/settings_helper.rb +24 -1

@@ -79,7 +79,12 module SettingsHelper
79		79
80	def setting_label(setting, options={})	80	def setting_label(setting, options={})
81	label = options.delete(:label)	81	label = options.delete(:label)
82	label != false ? label_tag("settings_#{setting}", l(label \|\| "setting_#{setting}"), options[:label_options]).html_safe : ''	82	if label == false
		83	''
		84	else
		85	text = label.is_a?(String) ? label : l(label \|\| "setting_#{setting}")
		86	label_tag("settings_#{setting}", text, options[:label_options])
		87	end
83	end	88	end
84		89
85	# Renders a notification field for a Redmine::Notifiable option	90	# Renders a notification field for a Redmine::Notifiable option
@@ -126,6 +131,24 module SettingsHelper
126	options.map {\|label, value\| [l(label), value.to_s]}	131	options.map {\|label, value\| [l(label), value.to_s]}
127	end	132	end
128		133
		134	def parent_issue_dates_options
		135	options = [
		136	[:label_parent_task_attributes_derived, 'derived'],
		137	[:label_parent_task_attributes_independent, 'independent']
		138	]
		139
		140	options.map {\|label, value\| [l(label), value.to_s]}
		141	end
		142
		143	def parent_issue_priority_options
		144	options = [
		145	[:label_parent_task_attributes_derived, 'derived'],
		146	[:label_parent_task_attributes_independent, 'independent']
		147	]
		148
		149	options.map {\|label, value\| [l(label), value.to_s]}
		150	end
		151
129	# Returns the options for the date_format setting	152	# Returns the options for the date_format setting
130	def date_format_setting_options(locale)	153	def date_format_setting_options(locale)
131	Setting::DATE_FORMATS.map do \|f\|	154	Setting::DATE_FORMATS.map do \|f\|

app/models/issue.rb +39 -18

                  	# Make sure that project_id can always be set for new issues
                   names |= %w(project_id)
                 end
+                if dates_derived?
+                  names -= %w(start_date due_date)
+                end
+                if priority_derived?
+                  names -= %w(priority_id)
+                end
+                unless leaf?
+                  names -= %w(done_ratio estimated_hours)
+                end
                 names
               end
                 attrs = delete_unsafe_attributes(attrs, user)
                 return if attrs.empty?
-                unless leaf?
-                  attrs.reject! {|k,v| %w(priority_id done_ratio start_date due_date estimated_hours).include?(k)}
-                end
                 if attrs['parent_issue_id'].present?
                   s = attrs['parent_issue_id'].to_s
                   unless (m = s.match(%r{\A#?(\d+)\z})) && (m[1] == parent_id.to_s || Issue.visible(user).exists?(m[1]))
               end
               def soonest_start(reload=false)
-                @soonest_start = nil if reload
+                if @soonest_start.nil? || reload
-                @soonest_start ||= (
+                  dates = relations_to(reload).collect{|relation| relation.successor_soonest_start}
-                    relations_to(reload).collect{|relation| relation.successor_soonest_start} +
+                  p = @parent_issue || parent
-                    [(@parent_issue || parent).try(:soonest_start)]
+                  if p && Setting.parent_issue_dates == 'derived'
-                  ).compact.max
+                    dates << p.soonest_start
+                  end
+                  @soonest_start = dates.compact.max
+                end
+                @soonest_start
               end
               # Sets start_date on the given date or the next working day
               # If the issue is a parent task, this is done by rescheduling its subtasks.
               def reschedule_on!(date)
                 return if date.nil?
-                if leaf?
+                if leaf? || !dates_derived?
                   if start_date.nil? || start_date != date
                     if start_date && start_date > date
                       # Issue can not be moved earlier than its soonest start date
                 end
               end
+              def dates_derived?
+                !leaf? && Setting.parent_issue_dates == 'derived'
+              end
+              def priority_derived?
+                !leaf? && Setting.parent_issue_priority == 'derived'
+              end
               def <=>(issue)
                 if issue.nil?
                   -1
               def recalculate_attributes_for(issue_id)
                 if issue_id && p = Issue.find_by_id(issue_id)
-                  # priority = highest priority of children
+                  if p.priority_derived?
-                  if priority_position = p.children.joins(:priority).maximum("#{IssuePriority.table_name}.position")
+                    # priority = highest priority of children
-                    p.priority = IssuePriority.find_by_position(priority_position)
+                    if priority_position = p.children.joins(:priority).maximum("#{IssuePriority.table_name}.position")
+                      p.priority = IssuePriority.find_by_position(priority_position)
+                    end
                   end
-                  # start/due dates = lowest/highest dates of children
+                  if p.dates_derived?
-                  p.start_date = p.children.minimum(:start_date)
+                    # start/due dates = lowest/highest dates of children
-                  p.due_date = p.children.maximum(:due_date)
+                    p.start_date = p.children.minimum(:start_date)
-                  if p.start_date && p.due_date && p.due_date < p.start_date
+                    p.due_date = p.children.maximum(:due_date)
-                    p.start_date, p.due_date = p.due_date, p.start_date
+                    if p.start_date && p.due_date && p.due_date < p.start_date
+                      p.start_date, p.due_date = p.due_date, p.start_date
+                    end
                   end
                   # done ratio = weighted average ratio of leaves

app/views/issues/_attributes.html.erb +4 -6

             <% if @issue.safe_attribute? 'start_date' %>
             <p id="start_date_area">
-              <%= f.text_field(:start_date, :size => 10, :disabled => !@issue.leaf?,
+              <%= f.text_field(:start_date, :size => 10, :required => @issue.required_attribute?('start_date')) %>
-                               :required => @issue.required_attribute?('start_date')) %>
               <%= calendar_for('issue_start_date') if @issue.leaf? %>
             </p>
             <% end %>
             <% if @issue.safe_attribute? 'due_date' %>
             <p id="due_date_area">
-              <%= f.text_field(:due_date, :size => 10, :disabled => !@issue.leaf?,
+              <%= f.text_field(:due_date, :size => 10, :required => @issue.required_attribute?('due_date')) %>
-                               :required => @issue.required_attribute?('due_date')) %>
               <%= calendar_for('issue_due_date') if @issue.leaf? %>
             </p>
             <% end %>
             <% if @issue.safe_attribute? 'estimated_hours' %>
-            <p><%= f.text_field :estimated_hours, :size => 3, :disabled => !@issue.leaf?, :required => @issue.required_attribute?('estimated_hours') %> <%= l(:field_hours) %></p>
+            <p><%= f.text_field :estimated_hours, :size => 3, :required => @issue.required_attribute?('estimated_hours') %> <%= l(:field_hours) %></p>
             <% end %>
-            <% if @issue.safe_attribute?('done_ratio') && @issue.leaf? && Issue.use_field_for_done_ratio? %>
+            <% if @issue.safe_attribute?('done_ratio') && Issue.use_field_for_done_ratio? %>
             <p><%= f.select :done_ratio, ((0..10).to_a.collect {|r| ["#{r*10} %", r*10] }), :required => @issue.required_attribute?('done_ratio') %></p>
             <% end %>
             </div>

app/views/settings/_issues.html.erb +9 0

@@ -23,6 +23,15
23	</div>	23	</div>
24		24
25	<fieldset class="box">	25	<fieldset class="box">
		26	<legend><%= l(:label_parent_task_attributes) %></legend>
		27	<div class="tabular settings">
		28	<p><%= setting_select :parent_issue_dates, parent_issue_dates_options, :label => "#{l(:field_start_date)} / #{l(:field_due_date)}" %></p>
		29
		30	<p><%= setting_select :parent_issue_priority, parent_issue_priority_options, :label => :field_priority %></p>
		31	</div>
		32	</fieldset>
		33
		34	<fieldset class="box">
26	<legend><%= l(:setting_issue_list_default_columns) %></legend>	35	<legend><%= l(:setting_issue_list_default_columns) %></legend>
27	<%= render_query_columns_selection(	36	<%= render_query_columns_selection(
28	IssueQuery.new(:column_names => Setting.issue_list_default_columns),	37	IssueQuery.new(:column_names => Setting.issue_list_default_columns),

config/locales/en.yml +3 0

               label_enable_notifications: Enable notifications
               label_disable_notifications: Disable notifications
               label_blank_value: blank
+              label_parent_task_attributes: Parent tasks attributes
+              label_parent_task_attributes_derived: Calculated from subtasks
+              label_parent_task_attributes_independent: Independent of subtasks
               button_login: Login
               button_submit: Submit

config/locales/fr.yml +1 0

               label_enable_notifications: Activer les notifications
               label_disable_notifications: Désactiver les notifications
               label_blank_value: non renseigné
+              label_parent_task_attributes: Attributs des tâches parentes
               button_login: Connexion
               button_submit: Soumettre

config/settings.yml +4 0

             # Enables subtasks to be in other projects
             cross_project_subtasks:
               default: 'tree'
+            parent_issue_dates:
+              default: 'derived'
+            parent_issue_priority:
+              default: 'derived'
             link_copied_issue:
               default: 'ask'
             issue_group_assignment:

test/object_helpers.rb +6 0

                 issue.reload
               end
+              def Issue.generate_with_child!(attributes={})
+                issue = Issue.generate!(attributes)
+                Issue.generate!(:parent_issue_id => issue.id)
+                issue.reload
+              end
               def Journal.generate!(attributes={})
                 journal = Journal.new(attributes)
                 journal.user ||= User.first

test/unit/issue_nested_set_test.rb 0 -43

@@ -287,35 +287,6 class IssueNestedSetTest < ActiveSupport::TestCase
287	end	287	end
288	end	288	end
289		289
290	def test_parent_priority_should_be_the_highest_child_priority
291	parent = Issue.generate!(:priority => IssuePriority.find_by_name('Normal'))
292	# Create children
293	child1 = parent.generate_child!(:priority => IssuePriority.find_by_name('High'))
294	assert_equal 'High', parent.reload.priority.name
295	child2 = child1.generate_child!(:priority => IssuePriority.find_by_name('Immediate'))
296	assert_equal 'Immediate', child1.reload.priority.name
297	assert_equal 'Immediate', parent.reload.priority.name
298	child3 = parent.generate_child!(:priority => IssuePriority.find_by_name('Low'))
299	assert_equal 'Immediate', parent.reload.priority.name
300	# Destroy a child
301	child1.destroy
302	assert_equal 'Low', parent.reload.priority.name
303	# Update a child
304	child3.reload.priority = IssuePriority.find_by_name('Normal')
305	child3.save!
306	assert_equal 'Normal', parent.reload.priority.name
307	end
308
309	def test_parent_dates_should_be_lowest_start_and_highest_due_dates
310	parent = Issue.generate!
311	parent.generate_child!(:start_date => '2010-01-25', :due_date => '2010-02-15')
312	parent.generate_child!( :due_date => '2010-02-13')
313	parent.generate_child!(:start_date => '2010-02-01', :due_date => '2010-02-22')
314	parent.reload
315	assert_equal Date.parse('2010-01-25'), parent.start_date
316	assert_equal Date.parse('2010-02-22'), parent.due_date
317	end
318
319	def test_parent_done_ratio_should_be_average_done_ratio_of_leaves	290	def test_parent_done_ratio_should_be_average_done_ratio_of_leaves
320	parent = Issue.generate!	291	parent = Issue.generate!
321	parent.generate_child!(:done_ratio => 20)	292	parent.generate_child!(:done_ratio => 20)
@@ -390,20 +361,6 class IssueNestedSetTest < ActiveSupport::TestCase
390	assert_nil first_parent.reload.estimated_hours	361	assert_nil first_parent.reload.estimated_hours
391	end	362	end
392		363
393	def test_reschuling_a_parent_should_reschedule_subtasks
394	parent = Issue.generate!
395	c1 = parent.generate_child!(:start_date => '2010-05-12', :due_date => '2010-05-18')
396	c2 = parent.generate_child!(:start_date => '2010-06-03', :due_date => '2010-06-10')
397	parent.reload
398	parent.reschedule_on!(Date.parse('2010-06-02'))
399	c1.reload
400	assert_equal [Date.parse('2010-06-02'), Date.parse('2010-06-08')], [c1.start_date, c1.due_date]
401	c2.reload
402	assert_equal [Date.parse('2010-06-03'), Date.parse('2010-06-10')], [c2.start_date, c2.due_date] # no change
403	parent.reload
404	assert_equal [Date.parse('2010-06-02'), Date.parse('2010-06-10')], [parent.start_date, parent.due_date]
405	end
406
407	def test_project_copy_should_copy_issue_tree	364	def test_project_copy_should_copy_issue_tree
408	p = Project.create!(:name => 'Tree copy', :identifier => 'tree-copy', :tracker_ids => [1, 2])	365	p = Project.create!(:name => 'Tree copy', :identifier => 'tree-copy', :tracker_ids => [1, 2])
409	i1 = Issue.generate!(:project => p, :subject => 'i1')	366	i1 = Issue.generate!(:project => p, :subject => 'i1')

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