r18452@gaspard (orig r1723): jplang | 2008-08-07 21:59:02 +0200

Slight change to engines to let plugins override views.
 r18456@gaspard (orig r1727):  jplang | 2008-08-10 17:22:54 +0200
 Moves @layout 'base'@ to ApplicationController.
 r18457@gaspard (orig r1728):  jplang | 2008-08-10 23:35:03 +0200
 Quote ids for attachment association since Trac's attachment.id is varchar (#1759).
 r18458@gaspard (orig r1729):  jplang | 2008-08-11 00:18:23 +0200
 Adds links to forum messages using message#id syntax (#1756).
 r18459@gaspard (orig r1730):  jplang | 2008-08-11 20:09:54 +0200
 Allow same name for custom fields on different object types.
 r18460@gaspard (orig r1731):  jplang | 2008-08-11 20:24:39 +0200
 Fixes custom fields display order at several places (#1768).
 r18461@gaspard (orig r1732):  edavis10 | 2008-08-11 22:49:52 +0200
 Added doc/README_FOR_APP so RDoc can be built.  (#1769)
 
 r18462@gaspard (orig r1733):  jplang | 2008-08-11 22:55:17 +0200
 Adds 'Edit' link on account/show for admin users.
 r18463@gaspard (orig r1734):  jplang | 2008-08-11 23:02:36 +0200
 Adds Lock/Unlock/Activate link on user edit screen.
 r18464@gaspard (orig r1735):  jplang | 2008-08-11 23:10:24 +0200
 Adds user count in status drop down on admin user list.
 r18472@gaspard (orig r1743):  edavis10 | 2008-08-13 05:54:54 +0200
 Added missing documentation for setting up the Darcs test repository.
 
 r18473@gaspard (orig r1744):  edavis10 | 2008-08-13 06:20:16 +0200
 Added rake tasks to generate rcov code coverage reports.  rake -T test:coverage to see them all
 
 r18474@gaspard (orig r1745):  edavis10 | 2008-08-13 06:20:23 +0200
 Extracted rcov options and removed gems from the rcov report.
 
 r18476@gaspard (orig r1747):  jplang | 2008-08-15 20:44:46 +0200
 No warning about rcov each time a rake task is ran.
 r18477@gaspard (orig r1748):  edavis10 | 2008-08-20 06:26:46 +0200
 Javascripts are now cached into a single file for downloads in production mode.
 
 Thanks to Philippe Lafoucrière for the patch.  (#1186)
 
 r18478@gaspard (orig r1749):  edavis10 | 2008-08-20 07:09:13 +0200
 Hiding the View Differences button when a wiki page's history only has one version.
 
 Patch contributed by Chaoqun Zou (#1743)
 
 r18479@gaspard (orig r1750):  edavis10 | 2008-08-20 08:14:44 +0200
 Messages on a Board can now be sorted by the number of replies.
 
   #1761
 
 r18480@gaspard (orig r1751):  edavis10 | 2008-08-20 08:21:06 +0200
 Added the "Status:" keyword to the MailHandler for setting and changing an Issue status via email.
 
   #1669
 


git-svn-id: http://redmine.rubyforge.org/svn/branches/work@1752 e93f8b46-1217-0410-a6f0-8f06a7374b81

hooks/app/models/mail_handler.rb

@@ -31,6 +31,8 @@ class MailHandler < ActionMailer::Base
     @@handler_options[:allow_override] ||= []
     # Project needs to be overridable if not specified
     @@handler_options[:allow_override] << 'project' unless @@handler_options[:issue].has_key?(:project)
+    # Status needs to be overridable if not specified
+    @@handler_options[:allow_override] << 'status' unless @@handler_options[:issue].has_key?(:status)    
     super email
   end
   
@@ -76,10 +78,11 @@ class MailHandler < ActionMailer::Base
     tracker = (get_keyword(:tracker) && project.trackers.find_by_name(get_keyword(:tracker))) || project.trackers.find(:first)
     category = (get_keyword(:category) && project.issue_categories.find_by_name(get_keyword(:category)))
     priority = (get_keyword(:priority) && Enumeration.find_by_opt_and_name('IPRI', get_keyword(:priority)))
+    status =  (get_keyword(:status) && IssueStatus.find_by_name(get_keyword(:status))) || IssueStatus.default
 
     # check permission
     raise UnauthorizedAction unless user.allowed_to?(:add_issues, project)
-    issue = Issue.new(:author => user, :project => project, :tracker => tracker, :category => category, :priority => priority)
+    issue = Issue.new(:author => user, :project => project, :tracker => tracker, :category => category, :priority => priority, :status => status)
     issue.subject = email.subject.chomp
     issue.description = email.plain_text_body.chomp
     issue.save!
@@ -100,13 +103,18 @@ class MailHandler < ActionMailer::Base
   
   # Adds a note to an existing issue
   def receive_issue_update(issue_id)
+    status =  (get_keyword(:status) && IssueStatus.find_by_name(get_keyword(:status)))
+    
     issue = Issue.find_by_id(issue_id)
     return unless issue
     # check permission
     raise UnauthorizedAction unless user.allowed_to?(:add_issue_notes, issue.project) || user.allowed_to?(:edit_issues, issue.project)
+    raise UnauthorizedAction unless status.nil? || user.allowed_to?(:edit_issues, issue.project)
+
     # add the note
     journal = issue.init_journal(user, email.plain_text_body.chomp)
     add_attachments(issue)
+    issue.status = status unless status.nil?
     issue.save!
     logger.info "MailHandler: issue ##{issue.id} updated by #{user}" if logger && logger.info
     Mailer.deliver_issue_edit(journal) if Setting.notified_events.include?('issue_updated')