deac/gitlabhq
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Refactor: grouping parent and their space by including array.

Browse source
This commit is contained in:
Sato Hiroyuki 2013-03-06 21:01:40 +09:00
parent 2f7f46b256
commit 784aa266bd
3 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/assets/javascripts/branch-graph.js
View file

@ -117,7 +117,7 @@
// Draw lines // Draw lines
for (var j = 0, jj = this.commits[i].parents.length; j < jj; j++) { for (var j = 0, jj = this.commits[i].parents.length; j < jj; j++) {
c = this.preparedCommits[this.commits[i].parents[j][0]]; c = this.preparedCommits[this.commits[i].parents[j][0]];
ps = this.commits[i].parent_spaces[j]; ps = this.commits[i].parents[j][1];
if (c) { if (c) {
var cx = offsetX + 20 * c.time var cx = offsetX + 20 * c.time
, cy = offsetY + 10 * c.space , cy = offsetY + 10 * c.space

5
app/helpers/graph_helper.rb
View file

@ -2,4 +2,9 @@ module GraphHelper
def join_with_space(ary) def join_with_space(ary)
ary.collect{|r|r.name}.join(" ") unless ary.nil? ary.collect{|r|r.name}.join(" ") unless ary.nil?
end end
def parents_zip_spaces(parents, parent_spaces)
ids = parents.map { |p| p.id }
ids.zip(parent_spaces)
end
end end

5
app/views/graph/show.json.erb
View file

@ -5,9 +5,7 @@
days: @graph.days.compact.map { |d| [d.day, d.strftime("%b")] }, days: @graph.days.compact.map { |d| [d.day, d.strftime("%b")] },
commits: @graph.commits.map do |c| commits: @graph.commits.map do |c|
{ {
parents: c.parents.collect do |p| parents: parents_zip_spaces(c.parents, c.parent_spaces),
[p.id,0,0]
end,
author: { author: {
name: c.author.name, name: c.author.name,
email: c.author.email, email: c.author.email,
@ -15,7 +13,6 @@
}, },
time: c.time, time: c.time,
space: c.spaces.first, space: c.spaces.first,
parent_spaces: c.parent_spaces,
refs: join_with_space(c.refs), refs: join_with_space(c.refs),
id: c.sha, id: c.sha,
date: c.date, date: c.date,