提交 2e5c1c27 编写于 作者: J James Lopez

fix events presenter after refactoring

上级 c6532ee3
...@@ -17,11 +17,11 @@ module Gitlab ...@@ -17,11 +17,11 @@ module Gitlab
event['total_time'] = distance_of_time_in_words(event['total_time'].to_f) event['total_time'] = distance_of_time_in_words(event['total_time'].to_f)
commit = first_time_reference_commit(event.delete('commits'), event) commit = first_time_reference_commit(event.delete('commits'), event)
event['title'] = commit.title event['title'] = commit.title
event['url'] = Gitlab::LightUrlBuilder.build(entity: :commit_url, project: @project, id: commit.id) event['url'] = Gitlab::LightUrlBuilder.build(entity: :commit, project: @project, id: commit.id)
event['sha'] = commit.short_id event['sha'] = commit.short_id
event['author_name'] = commit.author.name event['author_name'] = commit.author.name
event['author_profile_url'] = Gitlab::LightUrlBuilder.build(entity: :user, id: commit.author.username) event['author_profile_url'] = Gitlab::LightUrlBuilder.build(entity: :user, id: commit.author.username)
event['author_avatar_url'] = Gitlab::LightUrlBuilder.build(entity: :user_avatar_url, id: commit.author.id) event['author_avatar_url'] = Gitlab::LightUrlBuilder.build(entity: :user_avatar, id: commit.author.id)
end end
end end
...@@ -56,7 +56,7 @@ module Gitlab ...@@ -56,7 +56,7 @@ module Gitlab
event['total_time'] = distance_of_time_in_words(event['total_time'].to_f) event['total_time'] = distance_of_time_in_words(event['total_time'].to_f)
event['created_at'] = interval_in_words(event['created_at']) event['created_at'] = interval_in_words(event['created_at'])
event['author_profile_url'] = Gitlab::LightUrlBuilder.build(entity: :user, id: event['author_username']) event['author_profile_url'] = Gitlab::LightUrlBuilder.build(entity: :user, id: event['author_username'])
event['author_avatar_url'] = Gitlab::LightUrlBuilder.build(entity: :user_avatar_url, id: event['author_id']) event['author_avatar_url'] = Gitlab::LightUrlBuilder.build(entity: :user_avatar, id: event['author_id'])
event.except!('author_id', 'author_username') event.except!('author_id', 'author_username')
end end
...@@ -66,9 +66,9 @@ module Gitlab ...@@ -66,9 +66,9 @@ module Gitlab
event['name'] = build.name event['name'] = build.name
event['url'] = Gitlab::LightUrlBuilder.build(entity: :build, project: @project, id: build.id) event['url'] = Gitlab::LightUrlBuilder.build(entity: :build, project: @project, id: build.id)
event['branch'] = build.ref event['branch'] = build.ref
event['branch'] = Gitlab::LightUrlBuilder.build(entity: :branch, project: @project, id: build.ref) event['branch_url'] = Gitlab::LightUrlBuilder.build(entity: :branch, project: @project, id: build.ref)
event['sha'] = build.short_sha event['sha'] = build.short_sha
event['commit'] = Gitlab::LightUrlBuilder.build(entity: :commit, project: @project, id: build.sha) event['commit_url'] = Gitlab::LightUrlBuilder.build(entity: :commit, project: @project, id: build.sha)
event['date'] = build.started_at event['date'] = build.started_at
event['total_time'] = build.duration event['total_time'] = build.duration
event['author_name'] = build.author.try(:name) event['author_name'] = build.author.try(:name)
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册