diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2013-05-12 08:39:18 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2013-05-12 08:39:18 +0000 |
| commit | cf30a683125afb242933d440b36aa0f5dadee5bf (patch) | |
| tree | 423dfcdcd45f07398456196a95771d07ef811d2a /app/models | |
| parent | 8c9bba1cbfe4f1add132d2f1f16c030ad072700a (diff) | |
| download | redmine-cf30a683125afb242933d440b36aa0f5dadee5bf.tar.gz redmine-cf30a683125afb242933d440b36aa0f5dadee5bf.zip | |
Removes then's (#14015).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@11829 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app/models')
| -rw-r--r-- | app/models/issue.rb | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/app/models/issue.rb b/app/models/issue.rb index 29137077b..31d506fd3 100644 --- a/app/models/issue.rb +++ b/app/models/issue.rb @@ -897,7 +897,7 @@ class Issue < ActiveRecord::Base parent = current_issue.parent parentStatus = issue_status[parent] - if parent && (parentStatus == eNOT_DISCOVERED) && !except.include?(parent) then + if parent && (parentStatus == eNOT_DISCOVERED) && !except.include?(parent) queue << parent issue_status[parent] = ePROCESS_RELATIONS_ONLY @@ -906,7 +906,7 @@ class Issue < ActiveRecord::Base # Add children to queue, but only if they are not already in it and # the children of the current node need to be processed. - if current_issue.children && (current_issue_status == ePROCESS_CHILDREN_ONLY || current_issue_status == ePROCESS_ALL) then + if current_issue.children && (current_issue_status == ePROCESS_CHILDREN_ONLY || current_issue_status == ePROCESS_ALL) current_issue.children.each do |child| @@ -928,25 +928,25 @@ class Issue < ActiveRecord::Base # Add related issues to the queue, if they are not already in it. current_issue.relations_from.map(&:issue_to).each do |relatedIssue| - if (issue_status[relatedIssue] == eNOT_DISCOVERED) && !except.include?(relatedIssue) then + if (issue_status[relatedIssue] == eNOT_DISCOVERED) && !except.include?(relatedIssue) queue << relatedIssue issue_status[relatedIssue] = ePROCESS_ALL - elsif (issue_status[relatedIssue] == eRELATIONS_PROCESSED) && !except.include?(relatedIssue) then + elsif (issue_status[relatedIssue] == eRELATIONS_PROCESSED) && !except.include?(relatedIssue) queue << relatedIssue issue_status[relatedIssue] = ePROCESS_CHILDREN_ONLY - elsif (issue_status[relatedIssue] == ePROCESS_RELATIONS_ONLY) && !except.include?(relatedIssue) then + elsif (issue_status[relatedIssue] == ePROCESS_RELATIONS_ONLY) && !except.include?(relatedIssue) queue << relatedIssue issue_status[relatedIssue] = ePROCESS_ALL end end # Set new status for current issue - if (current_issue_status == ePROCESS_ALL) || (current_issue_status == ePROCESS_CHILDREN_ONLY) then + if (current_issue_status == ePROCESS_ALL) || (current_issue_status == ePROCESS_CHILDREN_ONLY) issue_status[current_issue] = eALL_PROCESSED - elsif (current_issue_status == ePROCESS_RELATIONS_ONLY) then + elsif (current_issue_status == ePROCESS_RELATIONS_ONLY) issue_status[current_issue] = eRELATIONS_PROCESSED end |