jro_apps/redmine Commit - r2072:2fa8030afc2f

31

@@handler_options[:allow_override] ||= []

31

@@handler_options[:allow_override] ||= []

32

# Project needs to be overridable if not specified

32

# Project needs to be overridable if not specified

33

@@handler_options[:allow_override] << 'project' unless @@handler_options[:issue].has_key?(:project)

33

@@handler_options[:allow_override] << 'project' unless @@handler_options[:issue].has_key?(:project)

34

# Status ~~needs to be~~ overridable ~~if not specified~~

34

# Status overridable by default

35

@@handler_options[:allow_override] << 'status' unless @@handler_options[:issue].has_key?(:status)

35

@@handler_options[:allow_override] << 'status' unless @@handler_options[:issue].has_key?(:status)

36

super email

36

super email

37

end

37

end

78

tracker = (get_keyword(:tracker) && project.trackers.find_by_name(get_keyword(:tracker))) || project.trackers.find(:first)

78

tracker = (get_keyword(:tracker) && project.trackers.find_by_name(get_keyword(:tracker))) || project.trackers.find(:first)

79

category = (get_keyword(:category) && project.issue_categories.find_by_name(get_keyword(:category)))

79

category = (get_keyword(:category) && project.issue_categories.find_by_name(get_keyword(:category)))

80

priority = (get_keyword(:priority) && Enumeration.find_by_opt_and_name('IPRI', get_keyword(:priority)))

80

priority = (get_keyword(:priority) && Enumeration.find_by_opt_and_name('IPRI', get_keyword(:priority)))

81

status = (get_keyword(:status) && IssueStatus.find_by_name(get_keyword(:status))) || ~~IssueStatus~~.~~default~~

81

status = (get_keyword(:status) && IssueStatus.find_by_name(get_keyword(:status)))

82

83

# check permission

83

# check permission

84

raise UnauthorizedAction unless user.allowed_to?(:add_issues, project)

84

raise UnauthorizedAction unless user.allowed_to?(:add_issues, project)

85

issue = Issue.new(:author => user, :project => project, :tracker => tracker, :category => category, :priority => priority, ~~:status~~ => ~~status~~)

85

issue = Issue.new(:author => user, :project => project, :tracker => tracker, :category => category, :priority => priority)

86

# check workflow

87

if status && issue.new_statuses_allowed_to(user).include?(status)

88

issue.status = status

89

end

86

issue.subject = email.subject.chomp.toutf8

90

issue.subject = email.subject.chomp.toutf8

87

issue.description = email.plain_text_body.chomp

91

issue.description = email.plain_text_body.chomp

88

issue.save!

92

issue.save!

114

# add the note

118

# add the note

115

journal = issue.init_journal(user, email.plain_text_body.chomp)

119

journal = issue.init_journal(user, email.plain_text_body.chomp)

116

add_attachments(issue)

120

add_attachments(issue)

117

issue.status = status unless status.nil?

121

# check workflow

122

if status && issue.new_statuses_allowed_to(user).include?(status)

123

issue.status = status

124

end

118

issue.save!

125

issue.save!

119

logger.info "MailHandler: issue ##{issue.id} updated by #{user}" if logger && logger.info

126

logger.info "MailHandler: issue ##{issue.id} updated by #{user}" if logger && logger.info

120

Mailer.deliver_issue_edit(journal) if Setting.notified_events.include?('issue_updated')

127

Mailer.deliver_issue_edit(journal) if Setting.notified_events.include?('issue_updated')

	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

                 @@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
+                # Status overridable by default
                 @@handler_options[:allow_override] << 'status' unless @@handler_options[:issue].has_key?(:status)
                 super email
               end
                 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
+                status =  (get_keyword(:status) && IssueStatus.find_by_name(get_keyword(:status)))
                 # check permission
                 raise UnauthorizedAction unless user.allowed_to?(:add_issues, project)
-                issue = Issue.new(:author => user, :project => project, :tracker => tracker, :category => category, :priority => priority, :status => status)
+                issue = Issue.new(:author => user, :project => project, :tracker => tracker, :category => category, :priority => priority)
+                # check workflow
+                if status && issue.new_statuses_allowed_to(user).include?(status)
+                  issue.status = status
+                end
                 issue.subject = email.subject.chomp.toutf8
                 issue.description = email.plain_text_body.chomp
                 issue.save!
                 # add the note
                 journal = issue.init_journal(user, email.plain_text_body.chomp)
                 add_attachments(issue)
-                issue.status = status unless status.nil?
+                # check workflow
+                if status && issue.new_statuses_allowed_to(user).include?(status)
+                  issue.status = status
+                end
                 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')