pullrequest消息通知(未完)

This commit is contained in:
daiao 2016-11-29 18:19:29 +08:00
parent ea30873665
commit 2cee4448ea
2 changed files with 17 additions and 7 deletions

View File

@ -90,6 +90,20 @@ module UsersHelper
end end
end end
# 获取pullrequest消息状态
def pull_request_message_status ma
case ma.status
when 1
"创建了PullRequest:"
when 2
"接受了您的PullRequest:"
when 3
"重新打开了PullRequest:"
when 4
"关闭了您的PullRequest:"
end
end
# 判断当前用户能否对消息进行操作 # 判断当前用户能否对消息进行操作
def allow_to_show applied_message def allow_to_show applied_message
(User.current.id == applied_message.user_id && applied_message.status == 1) ? true : false (User.current.id == applied_message.user_id && applied_message.status == 1) ? true : false

View File

@ -206,16 +206,12 @@
<%=link_to User.find(ma.forge_message.author).show_name, user_path(ma.forge_message.author), <%=link_to User.find(ma.forge_message.author).show_name, user_path(ma.forge_message.author),
:class => "newsBlue homepageNewsPublisher", :target => '_blank' %> :class => "newsBlue homepageNewsPublisher", :target => '_blank' %>
<span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl":"homepageNewsType fl" %>"> <span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl":"homepageNewsType fl" %>">
<% if ma.status == 1 %> <%= pull_request_message_status(ma) %>
创建了PullRequest:
<% elsif ma.status == 3 %>
重新打开了PullRequest:
<% end %>
</span> </span>
</li> </li>
<li class="homepageNewsContent fl"> <li class="homepageNewsContent fl">
<%= link_to "#{ma.forge_message.forge_message_id.title}", <%= link_to "#{ma.forge_message.forge_message_id.title}", {:controller => 'pull_requests', :action => 'show', :id => ma.forge_message.project_id },
{:controller => 'pull_requests', :action => 'show', :id => ma.forge_message.project_id },:class =>"#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}", :target => '_blank' %> :class =>"#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}", :target => '_blank' %>
</li> </li>
<li class="homepageNewsTime fl"><%= time_tag(ma.created_at).html_safe %> </li> <li class="homepageNewsTime fl"><%= time_tag(ma.created_at).html_safe %> </li>