jacknudt
/
socialforge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'origin/szzh' into szzh

This commit is contained in:
lizanle 2015-09-25 16:11:20 +08:00
parent 959d3f1a93 c906c7ee1d
commit a8812dd48e
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/helpers/users_helper.rb
View File

@ -464,7 +464,7 @@ module UsersHelper
no_html = "message" no_html = "message"
arr = details_to_strings(journal.details, no_html) arr = details_to_strings(journal.details, no_html)
unless journal.notes.blank? unless journal.notes.blank?
arr << "留言内容：" + journal.notes arr << journal.notes
end end
str = '' str = ''
arr.each { |item| str = str+item } arr.each { |item| str = str+item }

2
app/views/users/user_messages.html.erb
View File

@ -542,7 +542,7 @@
更新了问题状态：</span> 更新了问题状态：</span>
</li> </li>
<li class="homepageNewsContent fl"><a href="javascript:void(0);" class="newsGrey"> <li class="homepageNewsContent fl"><a href="javascript:void(0);" class="newsGrey">
<%= link_to get_issue_des_update(ma.forge_message).html_safe, <%= link_to ma.forge_message.journalized.subject,
issue_path(:id => ma.forge_message.journalized_id), :class => "#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}", issue_path(:id => ma.forge_message.journalized_id), :class => "#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}",
:onmouseover =>"message_titile_show($(this),event)", :onmouseover =>"message_titile_show($(this),event)",
:onmouseout => "message_titile_hide($(this))" %></a> :onmouseout => "message_titile_hide($(this))" %></a>