##// END OF EJS Templates
code layout cleanup app/models/mail_handler.rb...
Toshi MARUYAMA -
r8624:7b600cdb91eb
parent child
Show More
@@ -226,7 +226,8 class MailHandler < ActionMailer::Base
226 @keywords[attr]
226 @keywords[attr]
227 else
227 else
228 @keywords[attr] = begin
228 @keywords[attr] = begin
229 if (options[:override] || @@handler_options[:allow_override].include?(attr.to_s)) && (v = extract_keyword!(plain_text_body, attr, options[:format]))
229 if (options[:override] || @@handler_options[:allow_override].include?(attr.to_s)) &&
230 (v = extract_keyword!(plain_text_body, attr, options[:format]))
230 v
231 v
231 elsif !@@handler_options[:issue][attr].blank?
232 elsif !@@handler_options[:issue][attr].blank?
232 @@handler_options[:issue][attr]
233 @@handler_options[:issue][attr]
@@ -269,7 +270,8 class MailHandler < ActionMailer::Base
269 'priority_id' => (k = get_keyword(:priority)) && IssuePriority.named(k).first.try(:id),
270 'priority_id' => (k = get_keyword(:priority)) && IssuePriority.named(k).first.try(:id),
270 'category_id' => (k = get_keyword(:category)) && issue.project.issue_categories.named(k).first.try(:id),
271 'category_id' => (k = get_keyword(:category)) && issue.project.issue_categories.named(k).first.try(:id),
271 'assigned_to_id' => assigned_to.try(:id),
272 'assigned_to_id' => assigned_to.try(:id),
272 'fixed_version_id' => (k = get_keyword(:fixed_version, :override => true)) && issue.project.shared_versions.named(k).first.try(:id),
273 'fixed_version_id' => (k = get_keyword(:fixed_version, :override => true)) &&
274 issue.project.shared_versions.named(k).first.try(:id),
273 'start_date' => get_keyword(:start_date, :override => true, :format => '\d{4}-\d{2}-\d{2}'),
275 'start_date' => get_keyword(:start_date, :override => true, :format => '\d{4}-\d{2}-\d{2}'),
274 'due_date' => get_keyword(:due_date, :override => true, :format => '\d{4}-\d{2}-\d{2}'),
276 'due_date' => get_keyword(:due_date, :override => true, :format => '\d{4}-\d{2}-\d{2}'),
275 'estimated_hours' => get_keyword(:estimated_hours, :override => true),
277 'estimated_hours' => get_keyword(:estimated_hours, :override => true),
General Comments 0
You need to be logged in to leave comments. Login now