Skip to content
代码片段 群组 项目
提交 1d3efeb7 编辑于 作者: Alex Kalderimis's avatar Alex Kalderimis
浏览文件

Support display of wiki events

This updates templates and views to support wiki events
上级 0c342a8c
No related branches found
No related tags found
无相关合并请求
...@@ -70,6 +70,8 @@ def comments_visible? ...@@ -70,6 +70,8 @@ def comments_visible?
def event_preposition(event) def event_preposition(event)
if event.push_action? || event.commented_action? || event.target if event.push_action? || event.commented_action? || event.target
"at" "at"
elsif event.wiki_page?
_("Events|in the wiki for")
elsif event.milestone? elsif event.milestone?
"in" "in"
end end
...@@ -172,6 +174,19 @@ def event_note_target_url(event) ...@@ -172,6 +174,19 @@ def event_note_target_url(event)
end end
end end
def event_wiki_title_html(event)
capture do
concat content_tag(:span, _('wiki page'), class: "event-target-type append-right-4")
concat link_to(event.wiki_page_title, event_wiki_page_target_url(event),
title: event.target_title,
class: 'has-tooltip event-target-link append-right-4')
end
end
def event_wiki_page_target_url(event)
project_wiki_url(event.project, event.wiki_page_title)
end
def event_note_title_html(event) def event_note_title_html(event)
if event.note_target if event.note_target
capture do capture do
......
...@@ -5,7 +5,9 @@ ...@@ -5,7 +5,9 @@
.event-item-timestamp .event-item-timestamp
#{time_ago_with_tooltip(event.created_at)} #{time_ago_with_tooltip(event.created_at)}
- if event.created_project_action? - if event.wiki_page?
= render "events/event/wiki", event: event
- elsif event.created_project_action?
= render "events/event/created_project", event: event = render "events/event/created_project", event: event
- elsif event.push_action? - elsif event.push_action?
= render "events/event/push", event: event = render "events/event/push", event: event
......
= icon_for_profile_event(event)
= event_user_info(event)
.event-title.d-flex.flex-wrap
= inline_event_icon(event)
%span.event-type.d-inline-block.append-right-4{ class: event.action_name }
= event.action_name
= event_wiki_title_html(event)
= render "events/event_scope", event: event
...@@ -15,4 +15,6 @@ ...@@ -15,4 +15,6 @@
= render_if_exists 'events/epics_filter' = render_if_exists 'events/epics_filter'
- if comments_visible? - if comments_visible?
= event_filter_link EventFilter::COMMENTS, _('Comments'), s_('EventFilterBy|Filter by comments') = event_filter_link EventFilter::COMMENTS, _('Comments'), s_('EventFilterBy|Filter by comments')
- if @project.nil? || @project.has_wiki?
= event_filter_link EventFilter::WIKI, _('Wiki'), s_('EventFilterBy|Filter by wiki')
= event_filter_link EventFilter::TEAM, _('Team'), s_('EventFilterBy|Filter by team') = event_filter_link EventFilter::TEAM, _('Team'), s_('EventFilterBy|Filter by team')
---
title: Support wiki events in activity streams
merge_request: 23869
author:
type: changed
0% 加载中 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册