Commit 020e6168 authored by Robert Speicher's avatar Robert Speicher

Reduce duplication and branching logic in EventsHelper

Remove unused methods from Event model
parent 0ec2ee71
...@@ -57,11 +57,7 @@ module EventsHelper ...@@ -57,11 +57,7 @@ module EventsHelper
words << event.ref_name words << event.ref_name
words << "at" words << "at"
elsif event.commented? elsif event.commented?
if event.commit_note? words << event.note_target_reference
words << event.note_short_commit_id
else
words << "##{truncate event.note_target_iid}"
end
words << "at" words << "at"
elsif event.milestone? elsif event.milestone?
words << "##{event.target_iid}" if event.target_iid words << "##{event.target_iid}" if event.target_iid
...@@ -89,17 +85,8 @@ module EventsHelper ...@@ -89,17 +85,8 @@ module EventsHelper
event.note_target) event.note_target)
elsif event.note? elsif event.note?
if event.note_target if event.note_target
if event.commit_note?
namespace_project_commit_path(event.project.namespace, event.project,
event.note_commit_id,
anchor: dom_id(event.target))
elsif event.project_snippet_note?
namespace_project_snippet_path(event.project.namespace,
event.project, event.note_target)
else
event_note_target_path(event) event_note_target_path(event)
end end
end
elsif event.push? elsif event.push?
push_event_feed_url(event) push_event_feed_url(event)
end end
...@@ -135,8 +122,15 @@ module EventsHelper ...@@ -135,8 +122,15 @@ module EventsHelper
def event_note_target_path(event) def event_note_target_path(event)
if event.note? && event.commit_note? if event.note? && event.commit_note?
namespace_project_commit_path(event.project.namespace, event.project, namespace_project_commit_path(event.project.namespace,
event.note_target) event.project,
event.note_target,
anchor: dom_id(event.target))
elsif event.project_snippet_note?
namespace_project_snippet_path(event.project.namespace,
event.project,
event.note_target,
anchor: dom_id(event.target))
else else
polymorphic_path([event.project.namespace.becomes(Namespace), polymorphic_path([event.project.namespace.becomes(Namespace),
event.project, event.note_target], event.project, event.note_target],
...@@ -146,31 +140,11 @@ module EventsHelper ...@@ -146,31 +140,11 @@ module EventsHelper
def event_note_title_html(event) def event_note_title_html(event)
if event.note_target if event.note_target
if event.commit_note? link_to(event_note_target_path(event), title: event.target_title, class: 'has-tooltip') do
link_to( "#{event.note_target_type} #{event.note_target_reference}"
namespace_project_commit_path(event.project.namespace, event.project,
event.note_commit_id,
anchor: dom_id(event.target)),
title: event.target_title,
class: "commit_short_id"
) do
"#{event.note_target_type} #{event.note_short_commit_id}"
end
elsif event.project_snippet_note?
link_to(namespace_project_snippet_path(event.project.namespace,
event.project,
event.note_target), title: event.project.name) do
"#{event.note_target_type} #{truncate event.note_target.to_reference}"
end end
else else
link_to event_note_target_path(event), title: event.target_title do content_tag(:strong, '(deleted)')
"#{event.note_target_type} #{truncate event.note_target.to_reference}"
end
end
else
content_tag :strong do
"(deleted)"
end
end end
end end
......
...@@ -266,18 +266,10 @@ class Event < ActiveRecord::Base ...@@ -266,18 +266,10 @@ class Event < ActiveRecord::Base
branch? && project.default_branch != branch_name branch? && project.default_branch != branch_name
end end
def note_commit_id
target.commit_id
end
def target_iid def target_iid
target.respond_to?(:iid) ? target.iid : target_id target.respond_to?(:iid) ? target.iid : target_id
end end
def note_short_commit_id
Commit.truncate_sha(note_commit_id)
end
def commit_note? def commit_note?
target.for_commit? target.for_commit?
end end
...@@ -302,12 +294,15 @@ class Event < ActiveRecord::Base ...@@ -302,12 +294,15 @@ class Event < ActiveRecord::Base
end end
end end
def note_target_iid def note_target_reference
if note_target.respond_to?(:iid) return unless note_target
note_target.iid
# Commit#to_reference returns the full SHA, but we want the short one here
if commit_note?
note_target.short_id
else else
note_target_id note_target.to_reference
end.to_s end
end end
def note_target_type def note_target_type
......
...@@ -50,6 +50,8 @@ class Project < ActiveRecord::Base ...@@ -50,6 +50,8 @@ class Project < ActiveRecord::Base
attr_accessor :new_default_branch attr_accessor :new_default_branch
attr_accessor :old_path_with_namespace attr_accessor :old_path_with_namespace
alias_attribute :title, :name
# Relations # Relations
belongs_to :creator, foreign_key: 'creator_id', class_name: 'User' belongs_to :creator, foreign_key: 'creator_id', class_name: 'User'
belongs_to :group, -> { where(type: Group) }, foreign_key: 'namespace_id' belongs_to :group, -> { where(type: Group) }, foreign_key: 'namespace_id'
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment