kolan
/
Redmine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Only process issues that have relations. 

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@11120 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Jean-Philippe Lang 2013-01-05 12:41:24 +00:00
parent 59ddbf8c09
commit f9325193be
2 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/redmine/helpers/gantt.rb
View File

@ -749,7 +749,10 @@ module Redmine
:class => "#{options[:css]} task_todo", :class => "#{options[:css]} task_todo",
:id => html_id} :id => html_id}
if options[:issue] if options[:issue]
content_opt[:data] = {"rels" => issue_relations(options[:issue]).to_json} rels = issue_relations(options[:issue])
if rels.present?
content_opt[:data] = {"rels" => rels.to_json}
end
end end
output << view.content_tag(:div, '&nbsp;'.html_safe, content_opt) output << view.content_tag(:div, '&nbsp;'.html_safe, content_opt)
if coords[:bar_late_end] if coords[:bar_late_end]

4
public/javascripts/gantt.js
View File

@ -13,12 +13,11 @@ function setDrawArea() {
function getRelationsArray() { function getRelationsArray() {
var arr = new Array(); var arr = new Array();
$.each($('div.task_todo'), function(index_div, element) { $.each($('div.task_todo[data-rels]'), function(index_div, element) {
var element_id = $(element).attr("id"); var element_id = $(element).attr("id");
if (element_id != null) { if (element_id != null) {
var issue_id = element_id.replace("task-todo-issue-", ""); var issue_id = element_id.replace("task-todo-issue-", "");
var data_rels = $(element).data("rels"); var data_rels = $(element).data("rels");
if (data_rels != null) {
for (rel_type_key in data_rels) { for (rel_type_key in data_rels) {
$.each(data_rels[rel_type_key], function(index_issue, element_issue) { $.each(data_rels[rel_type_key], function(index_issue, element_issue) {
arr.push({issue_from: issue_id, issue_to: element_issue, arr.push({issue_from: issue_id, issue_to: element_issue,
@ -26,7 +25,6 @@ function getRelationsArray() {
}); });
} }
} }
}
}); });
return arr; return arr;
} }