Merge remote-tracking branch 'origin/szzh' into szzh
This commit is contained in:
commit
a8812dd48e
|
@ -464,7 +464,7 @@ module UsersHelper
|
|||
no_html = "message"
|
||||
arr = details_to_strings(journal.details, no_html)
|
||||
unless journal.notes.blank?
|
||||
arr << "留言内容:" + journal.notes
|
||||
arr << journal.notes
|
||||
end
|
||||
str = ''
|
||||
arr.each { |item| str = str+item }
|
||||
|
|
|
@ -542,7 +542,7 @@
|
|||
更新了问题状态:</span>
|
||||
</li>
|
||||
<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"}",
|
||||
:onmouseover =>"message_titile_show($(this),event)",
|
||||
:onmouseout => "message_titile_hide($(this))" %></a>
|
||||
|
|
Loading…
Reference in New Issue