qyzh1996
/
trustieforge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh

This commit is contained in:
sw 2015-09-19 11:52:19 +08:00
parent bbc14dbe5c bc964ac931
commit d68ade19e1
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -64,10 +64,8 @@
<% unless usm.subject.nil? %>
<p><strong>标题：</strong><%= usm.subject %></p>
<% end %>
<% if usm.description.nil? && usm.content.nil? %>
<% else %>
<div class="fl"><strong>内容：</strong></div><div class="ml36"><%= usm.description.html_safe %></div>
<% if (!usm.description.nil? && usm.description != "") || (!usm.content.nil? && usm.content != "") %>
<div class="fl"><strong>内容：</strong></div><div class="ml36"><%= usm.description.nil? ? usm.content.html_safe : usm.description.html_safe %></div>
<% end %>
</div>
<li class="homepageNewsTime fl"><%= time_tag(usm.created_at).html_safe %> </li>