diff options
author | Sato Hiroyuki <sathiroyuki@gmail.com> | 2013-03-26 04:51:39 +0400 |
---|---|---|
committer | Sato Hiroyuki <sathiroyuki@gmail.com> | 2013-03-26 04:51:39 +0400 |
commit | b49c1cb161e4d97c4ee33ae45a48e948f1097e60 (patch) | |
tree | f7d64e6f7389641d031fe127f48e321c2d2b6aa5 /app | |
parent | 62ef763a80271b58e0c0f6e51891828f22689daa (diff) |
Display note count on network graph.
Diffstat (limited to 'app')
-rw-r--r-- | app/helpers/graph_helper.rb | 11 | ||||
-rw-r--r-- | app/views/graph/show.json.erb | 2 |
2 files changed, 10 insertions, 3 deletions
diff --git a/app/helpers/graph_helper.rb b/app/helpers/graph_helper.rb index 369330151f4..ca7d823a45a 100644 --- a/app/helpers/graph_helper.rb +++ b/app/helpers/graph_helper.rb @@ -1,6 +1,13 @@ module GraphHelper - def join_with_space(ary) - ary.collect{|r|r.name}.join(" ") unless ary.nil? + def get_refs(commit) + refs = "" + refs += commit.refs.collect{|r|r.name}.join(" ") if commit.refs + + # append note count + notes = @project.notes.for_commit_id(commit.id) + refs += "[#{notes.count}]" if notes.any? + + refs end def parents_zip_spaces(parents, parent_spaces) diff --git a/app/views/graph/show.json.erb b/app/views/graph/show.json.erb index d0a0709ac47..529d584971f 100644 --- a/app/views/graph/show.json.erb +++ b/app/views/graph/show.json.erb @@ -13,7 +13,7 @@ }, time: c.time, space: c.spaces.first, - refs: join_with_space(c.refs), + refs: get_refs(c), id: c.sha, date: c.date, message: c.message, |