jro_apps/redmine Commit - r11602:922acdbcc224

904

# the children of the current node need to be processed.

904

# the children of the current node need to be processed.

905

if current_issue.children && (current_issue_status == ePROCESS_CHILDREN_ONLY || current_issue_status == ePROCESS_ALL)

905

if current_issue.children && (current_issue_status == ePROCESS_CHILDREN_ONLY || current_issue_status == ePROCESS_ALL)

906

current_issue.children.each do |child|

906

current_issue.children.each do |child|

907

if (issue_status[child] == eNOT_DISCOVERED) && !except.include?(child)

907

next if except.include?(child)

908

909

if (issue_status[child] == eNOT_DISCOVERED)

908

queue << child

910

queue << child

909

issue_status[child] = ePROCESS_ALL

911

issue_status[child] = ePROCESS_ALL

910

elsif (issue_status[child] == eRELATIONS_PROCESSED) && !~~except~~.~~include?~~(~~child~~)

912

elsif (issue_status[child] == eRELATIONS_PROCESSED)

911

queue << child

913

queue << child

912

issue_status[child] = ePROCESS_CHILDREN_ONLY

914

issue_status[child] = ePROCESS_CHILDREN_ONLY

913

elsif (issue_status[child] == ePROCESS_RELATIONS_ONLY) && !~~except~~.~~include?~~(~~child~~)

915

elsif (issue_status[child] == ePROCESS_RELATIONS_ONLY)

914

queue << child

916

queue << child

915

issue_status[child] = ePROCESS_ALL

917

issue_status[child] = ePROCESS_ALL

916

end

918

end

919

921

920

# Add related issues to the queue, if they are not already in it.

922

# Add related issues to the queue, if they are not already in it.

921

current_issue.relations_from.map(&:issue_to).each do |related_issue|

923

current_issue.relations_from.map(&:issue_to).each do |related_issue|

922

if (issue_status[related_issue] == eNOT_DISCOVERED) && !except.include?(related_issue)

924

next if except.include?(related_issue)

925

926

if (issue_status[related_issue] == eNOT_DISCOVERED)

923

queue << related_issue

927

queue << related_issue

924

issue_status[related_issue] = ePROCESS_ALL

928

issue_status[related_issue] = ePROCESS_ALL

925

elsif (issue_status[related_issue] == eRELATIONS_PROCESSED) && !~~except~~.~~include?~~(~~related_issue~~)

929

elsif (issue_status[related_issue] == eRELATIONS_PROCESSED)

926

queue << related_issue

930

queue << related_issue

927

issue_status[related_issue] = ePROCESS_CHILDREN_ONLY

931

issue_status[related_issue] = ePROCESS_CHILDREN_ONLY

928

elsif (issue_status[related_issue] == ePROCESS_RELATIONS_ONLY) && !~~except~~.~~include?~~(~~related_issue~~)

932

elsif (issue_status[related_issue] == ePROCESS_RELATIONS_ONLY)

929

queue << related_issue

933

queue << related_issue

930

issue_status[related_issue] = ePROCESS_ALL

934

issue_status[related_issue] = ePROCESS_ALL

931

end

935

end

	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

                   # 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)
                     current_issue.children.each do |child|
-                      if (issue_status[child] == eNOT_DISCOVERED) && !except.include?(child)
+                      next if except.include?(child)
+                      if (issue_status[child] == eNOT_DISCOVERED)
                         queue << child
                         issue_status[child] = ePROCESS_ALL
-                      elsif (issue_status[child] == eRELATIONS_PROCESSED) && !except.include?(child)
+                      elsif (issue_status[child] == eRELATIONS_PROCESSED)
                         queue << child
                         issue_status[child] = ePROCESS_CHILDREN_ONLY
-                      elsif (issue_status[child] == ePROCESS_RELATIONS_ONLY) && !except.include?(child)
+                      elsif (issue_status[child] == ePROCESS_RELATIONS_ONLY)
                         queue << child
                         issue_status[child] = ePROCESS_ALL
                       end
                   # Add related issues to the queue, if they are not already in it.
                   current_issue.relations_from.map(&:issue_to).each do |related_issue|
-                    if (issue_status[related_issue] == eNOT_DISCOVERED) && !except.include?(related_issue)
+                    next if except.include?(related_issue)
+                    if (issue_status[related_issue] == eNOT_DISCOVERED)
                       queue << related_issue
                       issue_status[related_issue] = ePROCESS_ALL
-                    elsif (issue_status[related_issue] == eRELATIONS_PROCESSED) && !except.include?(related_issue)
+                    elsif (issue_status[related_issue] == eRELATIONS_PROCESSED)
                       queue << related_issue
                       issue_status[related_issue] = ePROCESS_CHILDREN_ONLY
-                    elsif (issue_status[related_issue] == ePROCESS_RELATIONS_ONLY) && !except.include?(related_issue)
+                    elsif (issue_status[related_issue] == ePROCESS_RELATIONS_ONLY)
                       queue << related_issue
                       issue_status[related_issue] = ePROCESS_ALL
                     end