##// END OF EJS Templates
jro_apps » redmine
RSS
Check inclusion only once (#14015)....
Jean-Philippe Lang -
r11602:922acdbcc224
parent child
Show More
Side by Side Unified
Context file:
r11602:922acdbcc224 Loading diff...:
Show file before | Show file after | Hide comments
@@ -904,13 +904,15 class Issue < ActiveRecord::Base
904 904 # the children of the current node need to be processed.
905 905 if current_issue.children && (current_issue_status == ePROCESS_CHILDREN_ONLY || current_issue_status == ePROCESS_ALL)
906 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 910 queue << child
909 911 issue_status[child] = ePROCESS_ALL
910 elsif (issue_status[child] == eRELATIONS_PROCESSED) && !except.include?(child)
912 elsif (issue_status[child] == eRELATIONS_PROCESSED)
911 913 queue << child
912 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 916 queue << child
915 917 issue_status[child] = ePROCESS_ALL
916 918 end
@@ -919,13 +921,15 class Issue < ActiveRecord::Base
919 921
920 922 # Add related issues to the queue, if they are not already in it.
921 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 927 queue << related_issue
924 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 930 queue << related_issue
927 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 933 queue << related_issue
930 934 issue_status[related_issue] = ePROCESS_ALL
931 935 end
General Comments 0
You need to be logged in to leave comments. Login now