Display note count on network graph.

Sato Hiroyuki
1 parent 62ef763a
Showing 2 changed files with 10 additions and 3 deletions Show diff stats
app/helpers/graph_helper.rb
app/views/graph/show.json.erb
 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)
@@ -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,
1	module GraphHelper	1	module GraphHelper
2	- def join_with_space(ary)
3	- ary.collect{\|r\|r.name}.join(" ") unless ary.nil?	2	+ def get_refs(commit)
		3	+ refs = ""
		4	+ refs += commit.refs.collect{\|r\|r.name}.join(" ") if commit.refs
		5	+
		6	+ # append note count
		7	+ notes = @project.notes.for_commit_id(commit.id)
		8	+ refs += "[#{notes.count}]" if notes.any?
		9	+
		10	+ refs
4	end	11	end
5		12
6	def parents_zip_spaces(parents, parent_spaces)	13	def parents_zip_spaces(parents, parent_spaces)
	@@ -13,7 +13,7 @@		@@ -13,7 +13,7 @@
13	},	13	},
14	time: c.time,	14	time: c.time,
15	space: c.spaces.first,	15	space: c.spaces.first,
16	- refs: join_with_space(c.refs),	16	+ refs: get_refs(c),
17	id: c.sha,	17	id: c.sha,
18	date: c.date,	18	date: c.date,
19	message: c.message,	19	message: c.message,