prevent app crash for events without git resources

Dmitriy Zaporozhets
1 parent f1799a23
Showing 2 changed files with 17 additions and 3 deletions Show diff stats
app/models/event/push_trait.rb
app/views/events/_event_push.html.haml
@@ -63,5 +63,19 @@ module Event::PushTrait
         "pushed to"
       end
     end
+
+    def parent_commit
+      commits.first.prev_commit
+    rescue => ex
+      nil
+    end
+
+    def last_commit
+      commits.last
+    end
+
+    def push_with_commits? 
+      md_ref? && commits.any? && parent_commit && last_commit
+    end
   end
 end
@@ -10,10 +10,10 @@
     = time_ago_in_words(event.created_at)
     ago.
-  - if event.md_ref?
+  - if event.push_with_commits?
     - if event.commits.count > 1
-      = link_to compare_project_commits_path(event.project, :from => event.commits.first.prev_commit_id, :to => event.commits.last.id) do 
-        %strong #{event.commits.first.commit.id[0..7]}...#{event.commits.last.id[0..7]}
+      = link_to compare_project_commits_path(event.project, :from => event.parent_commit.id, :to => event.last_commit.id) do 
+        %strong #{event.commits.first.id[0..7]}...#{event.last_commit.id[0..7]}
     - project = event.project  
     %ul.unstyled.event_commits
       - if event.commits.size > 3
	@@ -63,5 +63,19 @@ module Event::PushTrait		@@ -63,5 +63,19 @@ module Event::PushTrait
63	"pushed to"	63	"pushed to"
64	end	64	end
65	end	65	end
		66	+
		67	+ def parent_commit
		68	+ commits.first.prev_commit
		69	+ rescue => ex
		70	+ nil
		71	+ end
		72	+
		73	+ def last_commit
		74	+ commits.last
		75	+ end
		76	+
		77	+ def push_with_commits?
		78	+ md_ref? && commits.any? && parent_commit && last_commit
		79	+ end
66	end	80	end
67	end	81	end