Nemcio/Redmine
1
0
Fork 0
mirror of https://github.com/redmine/redmine.git synced 2026-07-31 22:11:04 +02:00
Code Issues Packages Projects Releases Activity

Merged r15547 and r15561 (#23020).

Browse Source 
git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@15566 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Jean-Philippe Lang
2016-06-18 10:57:22 +00:00
parent 60b9ea8945
commit 11b7b573df
5 changed files with 16 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/models/mail_handler.rb
View File

@@ -62,7 +62,7 @@ class MailHandler < ActionMailer::Base
# Use when receiving emails with rake tasks
def self.extract_options_from_env(env)
options = {:issue => {}}
%w(project status tracker category priority fixed_version).each do |option|
%w(project status tracker category priority assigned_to fixed_version).each do |option|
options[:issue][option.to_sym] = env[option] if env[option]
end
%w(allow_override unknown_user no_permission_check no_account_notice default_group project_from_subaddress).each do |option|

2
app/views/mail_handler/new.html.erb
View File

@@ -33,6 +33,8 @@
<label>tracker: <%= text_field_tag 'issue[tracker]' %></label>
<label>category: <%= text_field_tag 'issue[category]' %></label>
<label>priority: <%= text_field_tag 'issue[priority]' %></label>
<label>assigned_to: <%= text_field_tag 'issue[assigned_to]' %></label>
<label>fixed_version: <%= text_field_tag 'issue[fixed_version]' %></label>
<label>private: <%= check_box_tag 'issue[private]', 1 %></label>
<label>allow_override: <%= text_field_tag 'allow_override' %></label>
</fieldset>

1
extra/mail_handler/rdm-mailhandler.rb
View File

@@ -93,6 +93,7 @@ class RedmineMailHandler
opts.on("-t", "--tracker TRACKER", "name of the target tracker") {|v| self.issue_attributes['tracker'] = v}
opts.on( "--category CATEGORY", "name of the target category") {|v| self.issue_attributes['category'] = v}
opts.on( "--priority PRIORITY", "name of the target priority") {|v| self.issue_attributes['priority'] = v}
opts.on( "--assigned-to ASSIGNEE", "assignee (username or group name)") {|v| self.issue_attributes['assigned_to'] = v}
opts.on( "--fixed-version VERSION","name of the target version") {|v| self.issue_attributes['fixed_version'] = v}
opts.on( "--private", "create new issues as private") {|v| self.issue_attributes['is_private'] = '1'}
opts.on("-o", "--allow-override ATTRS", "allow email content to set attributes values",

1
lib/tasks/email.rake
View File

@@ -64,6 +64,7 @@ Issue attributes control options:
tracker=TRACKER name of the target tracker
category=CATEGORY name of the target category
priority=PRIORITY name of the target priority
assigned_to=ASSIGNEE assignee (username or group name)
fixed_version=VERSION name of the target version
private create new issues as private
allow_override=ATTRS allow email content to set attributes values

11
test/unit/mail_handler_test.rb
View File

@@ -140,6 +140,17 @@ class MailHandlerTest < ActiveSupport::TestCase
assert_equal 'Alpha', issue.reload.fixed_version.name
end
def test_add_issue_with_default_assigned_to
# This email contains: 'Project: onlinestore'
issue = submit_email(
'ticket_on_given_project.eml',
:issue => {:assigned_to => 'jsmith'}
)
assert issue.is_a?(Issue)
assert !issue.new_record?
assert_equal 'jsmith', issue.reload.assigned_to.login
end
def test_add_issue_with_status_override
# This email contains: 'Project: onlinestore' and 'Status: Resolved'
issue = submit_email('ticket_on_given_project.eml', :allow_override => ['status'])