jro_apps/redmine Commit - r3359:0341ac80eb36

84

ref_keywords = Setting.commit_ref_keywords.downcase.split(",").collect(&:strip)

84

ref_keywords = Setting.commit_ref_keywords.downcase.split(",").collect(&:strip)

85

# keywords used to fix issues

85

# keywords used to fix issues

86

fix_keywords = Setting.commit_fix_keywords.downcase.split(",").collect(&:strip)

86

fix_keywords = Setting.commit_fix_keywords.downcase.split(",").collect(&:strip)

87

# status and optional done ratio applied

88

fix_status = IssueStatus.find_by_id(Setting.commit_fix_status_id)

89

done_ratio = Setting.commit_fix_done_ratio.blank? ? nil : Setting.commit_fix_done_ratio.to_i

90

87

91

kw_regexp = (ref_keywords + fix_keywords).collect{|kw| Regexp.escape(kw)}.join("|")

88

kw_regexp = (ref_keywords + fix_keywords).collect{|kw| Regexp.escape(kw)}.join("|")

92

return if kw_regexp.blank?

89

return if kw_regexp.blank?

104

action = match[0]

101

action = match[0]

105

target_issue_ids = match[1].scan(/\d+/)

102

target_issue_ids = match[1].scan(/\d+/)

106

target_issues = find_referenced_issues_by_id(target_issue_ids)

103

target_issues = find_referenced_issues_by_id(target_issue_ids)

107

if fix_status && fix_keywords.include?(action.downcase)

104

if fix_keywords.include?(action.downcase) && fix_status = IssueStatus.find_by_id(Setting.commit_fix_status_id)

108

# update status of issues

105

# update status of issues

109

logger.debug "Issues fixed by changeset #{self.revision}: #{issue_ids.join(', ')}." if logger && logger.debug?

106

logger.debug "Issues fixed by changeset #{self.revision}: #{issue_ids.join(', ')}." if logger && logger.debug?

110

target_issues.each do |issue|

107

target_issues.each do |issue|

118

end

115

end

119

journal = issue.init_journal(user || User.anonymous, ll(Setting.default_language, :text_status_changed_by_changeset, csettext))

116

journal = issue.init_journal(user || User.anonymous, ll(Setting.default_language, :text_status_changed_by_changeset, csettext))

120

issue.status = fix_status

117

issue.status = fix_status

121

issue.done_ratio = done_ratio if done_ratio

118

unless Setting.commit_fix_done_ratio.blank?

119

issue.done_ratio = Setting.commit_fix_done_ratio.to_i

120

end

122

Redmine::Hook.call_hook(:model_changeset_scan_commit_for_issue_ids_pre_issue_update,

121

Redmine::Hook.call_hook(:model_changeset_scan_commit_for_issue_ids_pre_issue_update,

123

{ :changeset => self, :issue => issue })

122

{ :changeset => self, :issue => issue })

124

issue.save

123

issue.save

127

referenced_issues += target_issues

126

referenced_issues += target_issues

128

end

127

end

129

128

130

~~self~~.~~issues~~ = referenced_issues.uniq

129

referenced_issues.uniq!

130

self.issues = referenced_issues unless referenced_issues.empty?

131

end

131

end

132

133

def short_comments

133

def short_comments

167

# Finds issues that can be referenced by the commit message

167

# Finds issues that can be referenced by the commit message

168

# i.e. issues that belong to the repository project, a subproject or a parent project

168

# i.e. issues that belong to the repository project, a subproject or a parent project

169

def find_referenced_issues_by_id(ids)

169

def find_referenced_issues_by_id(ids)

170

return [] if ids.compact.empty?

170

Issue.find_all_by_id(ids, :include => :project).select {|issue|

171

Issue.find_all_by_id(ids, :include => :project).select {|issue|

171

project == issue.project || project.is_ancestor_of?(issue.project) || project.is_descendant_of?(issue.project)

172

project == issue.project || project.is_ancestor_of?(issue.project) || project.is_descendant_of?(issue.project)

172

}

173

}

	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

                 ref_keywords = Setting.commit_ref_keywords.downcase.split(",").collect(&:strip)
                 # keywords used to fix issues
                 fix_keywords = Setting.commit_fix_keywords.downcase.split(",").collect(&:strip)
-                # status and optional done ratio applied
-                fix_status = IssueStatus.find_by_id(Setting.commit_fix_status_id)
-                done_ratio = Setting.commit_fix_done_ratio.blank? ? nil : Setting.commit_fix_done_ratio.to_i
                 kw_regexp = (ref_keywords + fix_keywords).collect{|kw| Regexp.escape(kw)}.join("|")
                 return if kw_regexp.blank?
                   action = match[0]
                   target_issue_ids = match[1].scan(/\d+/)
                   target_issues = find_referenced_issues_by_id(target_issue_ids)
-                  if fix_status && fix_keywords.include?(action.downcase)
+                  if fix_keywords.include?(action.downcase) && fix_status = IssueStatus.find_by_id(Setting.commit_fix_status_id)
                     # update status of issues
                     logger.debug "Issues fixed by changeset #{self.revision}: #{issue_ids.join(', ')}." if logger && logger.debug?
                     target_issues.each do |issue|
                       end
                       journal = issue.init_journal(user || User.anonymous, ll(Setting.default_language, :text_status_changed_by_changeset, csettext))
                       issue.status = fix_status
-                      issue.done_ratio = done_ratio if done_ratio
+                      unless Setting.commit_fix_done_ratio.blank?
+                        issue.done_ratio = Setting.commit_fix_done_ratio.to_i
+                      end
                       Redmine::Hook.call_hook(:model_changeset_scan_commit_for_issue_ids_pre_issue_update,
                                               { :changeset => self, :issue => issue })
                       issue.save
                   referenced_issues += target_issues
                 end
-                self.issues = referenced_issues.uniq
+                referenced_issues.uniq!
+                self.issues = referenced_issues unless referenced_issues.empty?
               end
               def short_comments
               # Finds issues that can be referenced by the commit message
               # i.e. issues that belong to the repository project, a subproject or a parent project
               def find_referenced_issues_by_id(ids)
+                return [] if ids.compact.empty?
                 Issue.find_all_by_id(ids, :include => :project).select {|issue|
                   project == issue.project || project.is_ancestor_of?(issue.project) || project.is_descendant_of?(issue.project)
                 }