Skip to content

O
OHR Support
Commit e94c45d5 authored by Eric Davis's avatar Eric Davis
Browse files
Options

Add an "Assigned To" keyword to receiving email. #5594 

Will take a user's email address, login, or full name.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3764 e93f8b46-1217-0410-a6f0-8f06a7374b81
parent 080dc221
Hide whitespace changes
Inline Side-by-side
Showing with 19 additions and 1 deletion
app/models/mail_handler.rb
View file @ e94c45d5
...@@ -120,6 +120,7 @@ class MailHandler < ActionMailer::Base ...@@ -120,6 +120,7 @@ class MailHandler < ActionMailer::Base
category = (get_keyword(:category) && project.issue_categories.find_by_name(get_keyword(:category))) category = (get_keyword(:category) && project.issue_categories.find_by_name(get_keyword(:category)))
priority = (get_keyword(:priority) && IssuePriority.find_by_name(get_keyword(:priority))) priority = (get_keyword(:priority) && IssuePriority.find_by_name(get_keyword(:priority)))
status = (get_keyword(:status) && IssueStatus.find_by_name(get_keyword(:status))) status = (get_keyword(:status) && IssueStatus.find_by_name(get_keyword(:status)))
assigned_to = (get_keyword(:assigned_to, :override => true) && find_user_from_keyword(get_keyword(:assigned_to, :override => true)))
due_date = get_keyword(:due_date, :override => true) due_date = get_keyword(:due_date, :override => true)
start_date = get_keyword(:start_date, :override => true) start_date = get_keyword(:start_date, :override => true)
...@@ -128,7 +129,7 @@ class MailHandler < ActionMailer::Base ...@@ -128,7 +129,7 @@ class MailHandler < ActionMailer::Base
raise UnauthorizedAction unless user.allowed_to?(:add_issues, project) raise UnauthorizedAction unless user.allowed_to?(:add_issues, project)
end end
issue = Issue.new(:author => user, :project => project, :tracker => tracker, :category => category, :priority => priority, :due_date => due_date, :start_date => start_date) issue = Issue.new(:author => user, :project => project, :tracker => tracker, :category => category, :priority => priority, :due_date => due_date, :start_date => start_date, :assigned_to => assigned_to)
# check workflow # check workflow
if status && issue.new_statuses_allowed_to(user).include?(status) if status && issue.new_statuses_allowed_to(user).include?(status)
issue.status = status issue.status = status
...@@ -167,6 +168,7 @@ class MailHandler < ActionMailer::Base ...@@ -167,6 +168,7 @@ class MailHandler < ActionMailer::Base
status = (get_keyword(:status) && IssueStatus.find_by_name(get_keyword(:status))) status = (get_keyword(:status) && IssueStatus.find_by_name(get_keyword(:status)))
due_date = get_keyword(:due_date, :override => true) due_date = get_keyword(:due_date, :override => true)
start_date = get_keyword(:start_date, :override => true) start_date = get_keyword(:start_date, :override => true)
assigned_to = (get_keyword(:assigned_to, :override => true) && find_user_from_keyword(get_keyword(:assigned_to, :override => true)))
issue = Issue.find_by_id(issue_id) issue = Issue.find_by_id(issue_id)
return unless issue return unless issue
...@@ -185,6 +187,7 @@ class MailHandler < ActionMailer::Base ...@@ -185,6 +187,7 @@ class MailHandler < ActionMailer::Base
end end
issue.start_date = start_date if start_date issue.start_date = start_date if start_date
issue.due_date = due_date if due_date issue.due_date = due_date if due_date
issue.assigned_to = assigned_to if assigned_to
issue.save! issue.save!
logger.info "MailHandler: issue ##{issue.id} updated by #{user}" if logger && logger.info logger.info "MailHandler: issue ##{issue.id} updated by #{user}" if logger && logger.info
...@@ -320,4 +323,14 @@ class MailHandler < ActionMailer::Base ...@@ -320,4 +323,14 @@ class MailHandler < ActionMailer::Base
end end
body.strip body.strip
end end
def find_user_from_keyword(keyword)
user ||= User.find_by_mail(keyword)
user ||= User.find_by_login(keyword)
if user.nil? && keyword.match(/ /)
firstname, lastname = *(keyword.split) # "First Last Throwaway"
user ||= User.find_by_firstname_and_lastname(firstname, lastname)
end
user
end
end end
test/fixtures/mail_handler/ticket_on_given_project.eml
View file @ e94c45d5
...@@ -53,3 +53,5 @@ Project: onlinestore ...@@ -53,3 +53,5 @@ Project: onlinestore
Status: Resolved Status: Resolved
due date: 2010-12-31 due date: 2010-12-31
Start Date:2010-01-01 Start Date:2010-01-01
Assigned to: John Smith
test/fixtures/mail_handler/ticket_reply_with_status.eml
View file @ e94c45d5
...@@ -28,6 +28,7 @@ This is reply ...@@ -28,6 +28,7 @@ This is reply
Status: Resolved Status: Resolved
due date: 2010-12-31 due date: 2010-12-31
Start Date:2010-01-01 Start Date:2010-01-01
Assigned to: jsmith@somenet.foo
------=_NextPart_000_0067_01C8D3CE.711F9CC0 ------=_NextPart_000_0067_01C8D3CE.711F9CC0
Content-Type: text/html; Content-Type: text/html;
......
test/unit/mail_handler_test.rb
View file @ e94c45d5
...@@ -57,6 +57,7 @@ class MailHandlerTest < ActiveSupport::TestCase ...@@ -57,6 +57,7 @@ class MailHandlerTest < ActiveSupport::TestCase
assert issue.description.include?('Lorem ipsum dolor sit amet, consectetuer adipiscing elit.') assert issue.description.include?('Lorem ipsum dolor sit amet, consectetuer adipiscing elit.')
assert_equal '2010-01-01', issue.start_date.to_s assert_equal '2010-01-01', issue.start_date.to_s
assert_equal '2010-12-31', issue.due_date.to_s assert_equal '2010-12-31', issue.due_date.to_s
assert_equal User.find_by_login('jsmith'), issue.assigned_to
# keywords should be removed from the email body # keywords should be removed from the email body
assert !issue.description.match(/^Project:/i) assert !issue.description.match(/^Project:/i)
assert !issue.description.match(/^Status:/i) assert !issue.description.match(/^Status:/i)
...@@ -256,6 +257,7 @@ class MailHandlerTest < ActiveSupport::TestCase ...@@ -256,6 +257,7 @@ class MailHandlerTest < ActiveSupport::TestCase
assert_equal IssueStatus.find_by_name("Resolved"), issue.status assert_equal IssueStatus.find_by_name("Resolved"), issue.status
assert_equal '2010-01-01', issue.start_date.to_s assert_equal '2010-01-01', issue.start_date.to_s
assert_equal '2010-12-31', issue.due_date.to_s assert_equal '2010-12-31', issue.due_date.to_s
assert_equal User.find_by_login('jsmith'), issue.assigned_to
end end
def test_add_issue_note_should_send_email_notification def test_add_issue_note_should_send_email_notification
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment