jro_apps/redmine Commit - r4280:e0e8c14c2aef

Makes MailHandler accept all issue attributes and custom fields that can be set/updated (#4071, #4807, #5622, #6110)....

Jean-Philippe Lang -

r4280:e0e8c14c2aef

parent child

Context file:

r4280:e0e8c14c2aef

Collapse all files

app/models/issue.rb +7 -4

               def safe_attributes=(attrs, user=User.current)
                 return unless attrs.is_a?(Hash)
-                new_statuses_allowed = new_statuses_allowed_to(user)
                 # User can change issue attributes only if he has :edit permission or if a workflow transition is allowed
                 if new_record? || user.allowed_to?(:edit_issues, project)
                   attrs = attrs.reject {|k,v| !SAFE_ATTRIBUTES.include?(k)}
-                elsif new_statuses_allowed.any?
+                elsif new_statuses_allowed_to(user).any?
                   attrs = attrs.reject {|k,v| !SAFE_ATTRIBUTES_ON_TRANSITION.include?(k)}
                 else
                   return
                 end
+                # Tracker must be set before since new_statuses_allowed_to depends on it.
+                if t = attrs.delete('tracker_id')
+                  self.tracker_id = t
+                end
                 if attrs['status_id']
-                  unless new_statuses_allowed.collect(&:id).include?(attrs['status_id'].to_i)
+                  unless new_statuses_allowed_to(user).collect(&:id).include?(attrs['status_id'].to_i)
                     attrs.delete('status_id')
                   end
                 end

app/models/mail_handler.rb +43 -46

@@ -116,36 +116,20 class MailHandler < ActionMailer::Base
116	# Creates a new issue	116	# Creates a new issue
117	def receive_issue	117	def receive_issue
118	project = target_project	118	project = target_project
119	tracker = (get_keyword(:tracker) && project.trackers.find_by_name(get_keyword(:tracker))) \|\| project.trackers.find(:first)
120	category = (get_keyword(:category) && project.issue_categories.find_by_name(get_keyword(:category)))
121	priority = (get_keyword(:priority) && IssuePriority.find_by_name(get_keyword(:priority)))
122	status = (get_keyword(:status) && IssueStatus.find_by_name(get_keyword(:status)))
123	assigned_to = (get_keyword(:assigned_to, :override => true) && find_user_from_keyword(get_keyword(:assigned_to, :override => true)))
124	due_date = get_keyword(:due_date, :override => true)
125	start_date = get_keyword(:start_date, :override => true)
126
127	# check permission	119	# check permission
128	unless @@handler_options[:no_permission_check]	120	unless @@handler_options[:no_permission_check]
129	raise UnauthorizedAction unless user.allowed_to?(:add_issues, project)	121	raise UnauthorizedAction unless user.allowed_to?(:add_issues, project)
130	end	122	end
131		123
132	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)	124	issue = Issue.new(:author => user, :project => project)
133	# check workflow	125	issue.safe_attributes = issue_attributes_from_keywords(issue)
134	if status && issue.new_statuses_allowed_to(user).include?(status)	126	issue.safe_attributes = {'custom_field_values' => custom_field_values_from_keywords(issue)}
135	issue.status = status	127	issue.subject = email.subject.to_s.chomp[0,255]
136	end
137	issue.subject = email.subject.chomp[0,255]
138	if issue.subject.blank?	128	if issue.subject.blank?
139	issue.subject = '(no subject)'	129	issue.subject = '(no subject)'
140	end	130	end
141	# custom fields
142	issue.custom_field_values = issue.available_custom_fields.inject({}) do \|h, c\|
143	if value = get_keyword(c.name, :override => true)
144	h[c.id] = value
145	end
146	h
147	end
148	issue.description = cleaned_up_text_body	131	issue.description = cleaned_up_text_body
		132
149	# add To and Cc as watchers before saving so the watchers can reply to Redmine	133	# add To and Cc as watchers before saving so the watchers can reply to Redmine
150	add_watchers(issue)	134	add_watchers(issue)
151	issue.save!	135	issue.save!
@@ -154,41 +138,19 class MailHandler < ActionMailer::Base
154	issue	138	issue
155	end	139	end
156		140
157	def target_project
158	# TODO: other ways to specify project:
159	# * parse the email To field
160	# * specific project (eg. Setting.mail_handler_target_project)
161	target = Project.find_by_identifier(get_keyword(:project))
162	raise MissingInformation.new('Unable to determine target project') if target.nil?
163	target
164	end
165
166	# Adds a note to an existing issue	141	# Adds a note to an existing issue
167	def receive_issue_reply(issue_id)	142	def receive_issue_reply(issue_id)
168	status = (get_keyword(:status) && IssueStatus.find_by_name(get_keyword(:status)))
169	due_date = get_keyword(:due_date, :override => true)
170	start_date = get_keyword(:start_date, :override => true)
171	assigned_to = (get_keyword(:assigned_to, :override => true) && find_user_from_keyword(get_keyword(:assigned_to, :override => true)))
172
173	issue = Issue.find_by_id(issue_id)	143	issue = Issue.find_by_id(issue_id)
174	return unless issue	144	return unless issue
175	# check permission	145	# check permission
176	unless @@handler_options[:no_permission_check]	146	unless @@handler_options[:no_permission_check]
177	raise UnauthorizedAction unless user.allowed_to?(:add_issue_notes, issue.project) \|\| user.allowed_to?(:edit_issues, issue.project)	147	raise UnauthorizedAction unless user.allowed_to?(:add_issue_notes, issue.project) \|\| user.allowed_to?(:edit_issues, issue.project)
178	raise UnauthorizedAction unless status.nil? \|\| user.allowed_to?(:edit_issues, issue.project)
179	end	148	end
180		149
181	# add the note
182	journal = issue.init_journal(user, cleaned_up_text_body)	150	journal = issue.init_journal(user, cleaned_up_text_body)
		151	issue.safe_attributes = issue_attributes_from_keywords(issue)
		152	issue.safe_attributes = {'custom_field_values' => custom_field_values_from_keywords(issue)}
183	add_attachments(issue)	153	add_attachments(issue)
184	# check workflow
185	if status && issue.new_statuses_allowed_to(user).include?(status)
186	issue.status = status
187	end
188	issue.start_date = start_date if start_date
189	issue.due_date = due_date if due_date
190	issue.assigned_to = assigned_to if assigned_to
191
192	issue.save!	154	issue.save!
193	logger.info "MailHandler: issue ##{issue.id} updated by #{user}" if logger && logger.info	155	logger.info "MailHandler: issue ##{issue.id} updated by #{user}" if logger && logger.info
194	journal	156	journal
@@ -263,6 +225,41 class MailHandler < ActionMailer::Base
263	end	225	end
264	end	226	end
265	end	227	end
		228
		229	def target_project
		230	# TODO: other ways to specify project:
		231	# * parse the email To field
		232	# * specific project (eg. Setting.mail_handler_target_project)
		233	target = Project.find_by_identifier(get_keyword(:project))
		234	raise MissingInformation.new('Unable to determine target project') if target.nil?
		235	target
		236	end
		237
		238	# Returns a Hash of issue attributes extracted from keywords in the email body
		239	def issue_attributes_from_keywords(issue)
		240	{
		241	'tracker_id' => ((k = get_keyword(:tracker)) && issue.project.trackers.find_by_name(k).try(:id)) \|\| issue.project.trackers.find(:first).try(:id),
		242	'status_id' => (k = get_keyword(:status)) && IssueStatus.find_by_name(k).try(:id),
		243	'priority_id' => (k = get_keyword(:priority)) && IssuePriority.find_by_name(k).try(:id),
		244	'category_id' => (k = get_keyword(:category)) && issue.project.issue_categories.find_by_name(k).try(:id),
		245	'assigned_to_id' => (k = get_keyword(:assigned_to, :override => true)) && find_user_from_keyword(k).try(:id),
		246	'fixed_version_id' => (k = get_keyword(:fixed_version, :override => true)) && issue.project.shared_versions.find_by_name(k).try(:id),
		247	'start_date' => get_keyword(:start_date, :override => true),
		248	'due_date' => get_keyword(:due_date, :override => true),
		249	'estimated_hours' => get_keyword(:estimated_hours, :override => true),
		250	'done_ratio' => get_keyword(:done_ratio, :override => true),
		251	}.delete_if {\|k, v\| v.blank? }
		252	end
		253
		254	# Returns a Hash of issue custom field values extracted from keywords in the email body
		255	def custom_field_values_from_keywords(customized)
		256	customized.custom_field_values.inject({}) do \|h, v\|
		257	if value = get_keyword(v.custom_field.name, :override => true)
		258	h[v.custom_field.id.to_s] = value
		259	end
		260	h
		261	end
		262	end
266		263
267	# Returns the text/plain part of the email	264	# Returns the text/plain part of the email
268	# If not found (eg. HTML-only email), returns the body with tags removed	265	# If not found (eg. HTML-only email), returns the body with tags removed

test/fixtures/mail_handler/ticket_on_given_project.eml +3 0

             due date: 2010-12-31
             Start Date:2010-01-01
             Assigned to: John Smith
+            fixed version: alpha
+            estimated hours: 2.5
+            done ratio: 30

test/fixtures/mail_handler/ticket_reply_with_status.eml +1 0

             due date: 2010-12-31
             Start Date:2010-01-01
             Assigned to: jsmith@somenet.foo
+            searchable field: Updated custom value
             ------=_NextPart_000_0067_01C8D3CE.711F9CC0
             Content-Type: text/html;

test/unit/mail_handler_test.rb +5 0

                                :workflows,
                                :trackers,
                                :projects_trackers,
+                               :versions,
                                :enumerations,
                                :issue_categories,
                                :custom_fields,
                 assert_equal '2010-01-01', issue.start_date.to_s
                 assert_equal '2010-12-31', issue.due_date.to_s
                 assert_equal User.find_by_login('jsmith'), issue.assigned_to
+                assert_equal Version.find_by_name('alpha'), issue.fixed_version
+                assert_equal 2.5, issue.estimated_hours
+                assert_equal 30, issue.done_ratio
                 # keywords should be removed from the email body
                 assert !issue.description.match(/^Project:/i)
                 assert !issue.description.match(/^Status:/i)
                 assert_equal '2010-01-01', issue.start_date.to_s
                 assert_equal '2010-12-31', issue.due_date.to_s
                 assert_equal User.find_by_login('jsmith'), issue.assigned_to
+                assert_equal 'Updated custom value', issue.custom_value_for(CustomField.find_by_name('Searchable field')).value
               end
               def test_add_issue_note_should_send_email_notification

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