jro_apps/redmine Commit - r2700:6994d1c23b8d

Actually block issues from closing when a blocking issue isn't closed (#1740)....

Jean-Philippe Lang -

r2700:6994d1c23b8d

parent child

Context file:

r2700:6994d1c23b8d

Collapse all files

test/fixtures/issue_relations.yml created 644 +7 0

			@@ -0,0 +1,7
		1	issue_relation_001:
		2	id: 1
		3	issue_from_id: 10
		4	issue_to_id: 9
		5	relation_type: blocks
		6	delay:
		7

app/models/issue.rb +7 -1

                  project.assignable_users
                end
+               # Returns true if this issue is blocked by another issue that is still open
+               def blocked?
+                 !relations_to.detect {|ir| ir.relation_type == 'blocks' && !ir.issue_from.closed?}.nil?
+               end
                # Returns an array of status that user is able to apply
                def new_statuses_allowed_to(user)
                  statuses = status.find_new_statuses_allowed_to(user.roles_for_project(project), tracker)
                  statuses << status unless statuses.empty?
-                 statuses.uniq.sort
+                 statuses = statuses.uniq.sort
+                 blocked? ? statuses.reject {|s| s.is_closed?} : statuses
                end
                # Returns the mail adresses of users that should be notified for the issue

test/fixtures/issues.yml +32 -1

		@@ -125,4 +125,35 issues_008:
125	125	start_date:
126	126	due_date:
127	127	lock_version: 0
128
	128	issues_009:
	129	created_on: <%= 1.minute.ago.to_date.to_s(:db) %>
	130	project_id: 5
	131	updated_on: <%= 1.minute.ago.to_date.to_s(:db) %>
	132	priority_id: 5
	133	subject: Blocked Issue
	134	id: 9
	135	fixed_version_id:
	136	category_id:
	137	description: This is an issue that is blocked by issue #10
	138	tracker_id: 1
	139	assigned_to_id:
	140	author_id: 2
	141	status_id: 1
	142	start_date: <%= Date.today.to_s(:db) %>
	143	due_date: <%= 1.days.from_now.to_date.to_s(:db) %>
	144	issues_010:
	145	created_on: <%= 1.minute.ago.to_date.to_s(:db) %>
	146	project_id: 5
	147	updated_on: <%= 1.minute.ago.to_date.to_s(:db) %>
	148	priority_id: 5
	149	subject: Issue Doing the Blocking
	150	id: 10
	151	fixed_version_id:
	152	category_id:
	153	description: This is an issue that blocks issue #9
	154	tracker_id: 1
	155	assigned_to_id:
	156	author_id: 2
	157	status_id: 1
	158	start_date: <%= Date.today.to_s(:db) %>
	159	due_date: <%= 1.days.from_now.to_date.to_s(:db) %>

test/unit/issue_test.rb +27 -1

              class IssueTest < Test::Unit::TestCase
                fixtures :projects, :users, :members, :member_roles,
                         :trackers, :projects_trackers,
-                        :issue_statuses, :issue_categories,
+                        :issue_statuses, :issue_categories, :issue_relations, :workflows,
                         :enumerations,
                         :issues,
                         :custom_fields, :custom_fields_projects, :custom_fields_trackers, :custom_values,
                  assert_nil TimeEntry.find_by_issue_id(1)
                end
+               def test_blocked
+                 blocked_issue = Issue.find(9)
+                 blocking_issue = Issue.find(10)
+                 assert blocked_issue.blocked?
+                 assert !blocking_issue.blocked?
+               end
+               def test_blocked_issues_dont_allow_closed_statuses
+                 blocked_issue = Issue.find(9)
+                 allowed_statuses = blocked_issue.new_statuses_allowed_to(users(:users_002))
+                 assert !allowed_statuses.empty?
+                 closed_statuses = allowed_statuses.select {|st| st.is_closed?}
+                 assert closed_statuses.empty?
+               end
+               def test_unblocked_issues_allow_closed_statuses
+                 blocking_issue = Issue.find(10)
+                 allowed_statuses = blocking_issue.new_statuses_allowed_to(users(:users_002))
+                 assert !allowed_statuses.empty?
+                 closed_statuses = allowed_statuses.select {|st| st.is_closed?}
+                 assert !closed_statuses.empty?
+               end
                def test_overdue
                  assert Issue.new(:due_date => 1.day.ago.to_date).overdue?
                  assert !Issue.new(:due_date => Date.today).overdue?

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