Truncate some text from dashboard events

Dmitriy Zaporozhets
1 parent c9f741bb
Showing 3 changed files with 11 additions and 2 deletions Show diff stats
app/helpers/application_helper.rb
app/helpers/events_helper.rb
app/views/events/event/_push.html.haml
@@ -235,4 +235,11 @@ module ApplicationHelper
       "Search"
     end
   end
+
+  def first_line(str)
+    lines = str.split("\n")
+    line = lines.first
+    line += "..." if lines.size > 1
+    line
+  end
 end
@@ -123,6 +123,8 @@ module EventsHelper
   end
  
   def event_note(text)
-    sanitize(markdown(truncate(text, length: 150)), tags: %w(a img b pre p))
+    text = first_line(text)
+    text = truncate(text, length: 150)
+    sanitize(markdown(text), tags: %w(a img b pre p))
   end
 end
@@ -5,7 +5,7 @@
     %strong= event.ref_name
   - else
     = link_to project_commits_path(event.project, event.ref_name) do
-      %strong= event.ref_name
+      %strong= truncate(event.ref_name, length: 30)
   at
   %strong= link_to_project event.project
...	...	@@ -235,4 +235,11 @@ module ApplicationHelper
235	235	"Search"
236	236	end
237	237	end
	238	+
	239	+ def first_line(str)
	240	+ lines = str.split("\n")
	241	+ line = lines.first
	242	+ line += "..." if lines.size > 1
	243	+ line
	244	+ end
238	245	end
...	...
...	...	@@ -123,6 +123,8 @@ module EventsHelper
123	123	end
124	124
125	125	def event_note(text)
126		- sanitize(markdown(truncate(text, length: 150)), tags: %w(a img b pre p))
	126	+ text = first_line(text)
	127	+ text = truncate(text, length: 150)
	128	+ sanitize(markdown(text), tags: %w(a img b pre p))
127	129	end
128	130	end
...	...
...	...	@@ -5,7 +5,7 @@
5	5	%strong= event.ref_name
6	6	- else
7	7	= link_to project_commits_path(event.project, event.ref_name) do
8		- %strong= event.ref_name
	8	+ %strong= truncate(event.ref_name, length: 30)
9	9	at
10	10	%strong= link_to_project event.project
11	11
...	...