jro_apps/redmine Commit - r10889:59ddbf8c09a7

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

Jean-Philippe Lang -

r10889:59ddbf8c09a7

parent child

Context file:

r10889:59ddbf8c09a7

lib/redmine/helpers/gantt.rb +1 -5

                                       :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]

public/javascripts/gantt.js +2 -5

                    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) {
+                     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});
-                           });
-                       }
-                     }
-                   }
+                 }
                });
                return arr;
              }

General Comments 0

You need to be logged in to leave comments. Login now

No TODOs yet

	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