Use JSON so we don't have to parse data-rels manually (#3436).

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@11119 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/lib/redmine/helpers/gantt.rb b/lib/redmine/helpers/gantt.rb
index 5bf0a1e98d6a7ead847d466219208bdd6d5d313a..3238de8cfa7c0d61ef2979cf810b94f2e8077c17 100644 (file)
--- a/lib/redmine/helpers/gantt.rb
+++ b/lib/redmine/helpers/gantt.rb
@@ -749,11 +749,7 @@ module Redmine
                          :class => "#{options[:css]} task_todo",
                          :id => html_id}
           if options[:issue]
-            rels_hash = {}
-            issue_relations(options[:issue]).each do |k, v|
-              rels_hash[k] = v.join(',')
-            end
-            content_opt[:data] = {"rels" => rels_hash}
+            content_opt[:data] = {"rels" => issue_relations(options[:issue]).to_json}
           end
           output << view.content_tag(:div, '&nbsp;'.html_safe, content_opt)
           if coords[:bar_late_end]

diff --git a/public/javascripts/gantt.js b/public/javascripts/gantt.js
index e16f4028fd4c65887238ec398e4b91f6c8960f0e..51e2257e03e1bbe5a2b2804377b5cbff6a3ea9d5 100644 (file)
--- a/public/javascripts/gantt.js
+++ b/public/javascripts/gantt.js
@@ -19,14 +19,11 @@ function getRelationsArray() {
       var issue_id = element_id.replace("task-todo-issue-", "");
       var data_rels = $(element).data("rels");
       if (data_rels != null) {
-        for (rel_type_key in issue_relation_type) {
-          if (rel_type_key in data_rels) {
-            var issue_arr = data_rels[rel_type_key].toString().split(",");
-              $.each(issue_arr, function(index_issue, element_issue) {
-                arr.push({issue_from: issue_id, issue_to: element_issue,
-                          rel_type: rel_type_key});
-              });
-          }
+        for (rel_type_key in data_rels) {
+          $.each(data_rels[rel_type_key], function(index_issue, element_issue) {
+            arr.push({issue_from: issue_id, issue_to: element_issue,
+                      rel_type: rel_type_key});
+          });
         }
       }
     }