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

MailHandler: ignore assignee if invalid. 

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4404 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Jean-Philippe Lang 2010-11-14 13:48:01 +00:00
parent 97a9210483
commit d7cdd58db6
3 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/models/mail_handler.rb
View File

@ -253,12 +253,15 @@ class MailHandler < ActionMailer::Base
# Returns a Hash of issue attributes extracted from keywords in the email body # Returns a Hash of issue attributes extracted from keywords in the email body
def issue_attributes_from_keywords(issue) def issue_attributes_from_keywords(issue)
assigned_to = (k = get_keyword(:assigned_to, :override => true)) && find_user_from_keyword(k)
assigned_to = nil if assigned_to && !issue.assignable_users.include?(assigned_to)
{ {
'tracker_id' => ((k = get_keyword(:tracker)) && issue.project.trackers.find_by_name(k).try(:id)) || issue.project.trackers.find(:first).try(:id), 'tracker_id' => ((k = get_keyword(:tracker)) && issue.project.trackers.find_by_name(k).try(:id)) || issue.project.trackers.find(:first).try(:id),
'status_id' => (k = get_keyword(:status)) && IssueStatus.find_by_name(k).try(:id), 'status_id' => (k = get_keyword(:status)) && IssueStatus.find_by_name(k).try(:id),
'priority_id' => (k = get_keyword(:priority)) && IssuePriority.find_by_name(k).try(:id), 'priority_id' => (k = get_keyword(:priority)) && IssuePriority.find_by_name(k).try(:id),
'category_id' => (k = get_keyword(:category)) && issue.project.issue_categories.find_by_name(k).try(:id), 'category_id' => (k = get_keyword(:category)) && issue.project.issue_categories.find_by_name(k).try(:id),
'assigned_to_id' => (k = get_keyword(:assigned_to, :override => true)) && find_user_from_keyword(k).try(:id), 'assigned_to_id' => assigned_to.try(:id),
'fixed_version_id' => (k = get_keyword(:fixed_version, :override => true)) && issue.project.shared_versions.find_by_name(k).try(:id), 'fixed_version_id' => (k = get_keyword(:fixed_version, :override => true)) && issue.project.shared_versions.find_by_name(k).try(:id),
'start_date' => get_keyword(:start_date, :override => true, :format => '\d{4}-\d{2}-\d{2}'), 'start_date' => get_keyword(:start_date, :override => true, :format => '\d{4}-\d{2}-\d{2}'),
'due_date' => get_keyword(:due_date, :override => true, :format => '\d{4}-\d{2}-\d{2}'), 'due_date' => get_keyword(:due_date, :override => true, :format => '\d{4}-\d{2}-\d{2}'),

1
test/fixtures/mail_handler/ticket_with_invalid_attributes.eml vendored
View File

@ -40,6 +40,7 @@ pulvinar dui, a gravida orci mi eget odio. Nunc a lacus.
Project: onlinestore Project: onlinestore
Tracker: Feature request Tracker: Feature request
category: Stock management category: Stock management
assigned to: miscuser9@foo.bar
priority: foo priority: foo
done ratio: x done ratio: x
start date: some day start date: some day

2
test/unit/mail_handler_test.rb
View File

@ -25,6 +25,7 @@ class MailHandlerTest < ActiveSupport::TestCase
:roles, :roles,
:members, :members,
:member_roles, :member_roles,
:users,
:issues, :issues,
:issue_statuses, :issue_statuses,
:workflows, :workflows,
@ -234,6 +235,7 @@ class MailHandlerTest < ActiveSupport::TestCase
assert issue.is_a?(Issue) assert issue.is_a?(Issue)
assert !issue.new_record? assert !issue.new_record?
issue.reload issue.reload
assert_nil issue.assigned_to
assert_nil issue.start_date assert_nil issue.start_date
assert_nil issue.due_date assert_nil issue.due_date
assert_equal 0, issue.done_ratio assert_equal 0, issue.done_ratio