diff --git a/app/views/users/user_messages.html.erb b/app/views/users/user_messages.html.erb
index 171890ac1..a5cc70f99 100644
--- a/app/views/users/user_messages.html.erb
+++ b/app/views/users/user_messages.html.erb
@@ -90,8 +90,10 @@
:onmouseout => "message_titile_hide($(this))" %>
标题:<%= ma.course_message.title %>
-
内容:
-
<%= ma.course_message.description.html_safe %>
+ <% unless ma.course_message.description.nil? %>
+
内容:
+
<%= ma.course_message.description.html_safe %>
+ <% end %>
<%= time_tag(ma.created_at).html_safe %>
@@ -107,8 +109,10 @@
:onmouseout => "message_titile_hide($(this))" %>
标题:<%= ma.course_message.commented.title %>
-
内容:
-
<%= ma.course_message.comments.html_safe%>
+ <% unless ma.course_message.comments.nil? %>
+
内容:
+
<%= ma.course_message.comments.html_safe %>
+ <% end %>
<%= time_tag(ma.created_at).html_safe %>
@@ -124,8 +128,10 @@
:onmouseout => "message_titile_hide($(this))" %>
标题:<%= ma.course_message.name %>
-
内容:
-
<%= ma.course_message.description.html_safe %>
+ <% unless ma.course_message.description.nil? %>
+
内容:
+
<%= ma.course_message.description.html_safe %>
+ <% end %>
<%= time_tag(ma.created_at).html_safe %>
@@ -240,7 +246,15 @@
<%= link_to ma.course_message.subject, course_boards_path(ma.course_message.course, :parent_id => ma.course_message.parent_id ? ma.course_message.parent_id : ma.course_message.id, :topic_id => ma.course_message.id),
:class => "#{ma.viewed==0 ? "newsBlack" : "newsGrey"}",
- :title => "#{ma.course_message.subject.html_safe}" %>
+ :onmouseover =>"message_titile_show($(this),event)",
+ :onmouseout => "message_titile_hide($(this))" %>
+
+
主题:<%= ma.course_message.subject %>
+ <% unless ma.course_message.content.nil? %>
+
内容:
+
<%= ma.course_message.content.html_safe %>
+ <% end %>
+
<% else %>
<%= link_to ma.course_message.content.html_safe, course_boards_path(ma.course_message.course, :parent_id => ma.course_message.parent_id ? ma.course_message.parent_id : ma.course_message.id, :topic_id => ma.course_message.id),
@@ -249,8 +263,10 @@
:onmouseout => "message_titile_hide($(this))" %>
主题:<%= ma.course_message.subject %>
-
内容:
-
<%= ma.course_message.content.html_safe %>
+ <% unless ma.course_message.content.nil? %>
+
内容:
+
<%= ma.course_message.content.html_safe %>
+ <% end %>
<% end %>
<%= time_tag(ma.created_at).html_safe %>
@@ -386,8 +402,10 @@
主题:<%= ma.forge_message.subject %>
-
描述:
-
<%= ma.forge_message.description.html_safe %>
+ <% unless ma.forge_message.description.nil? || ma.forge_message.description == "" %>
+
描述:
+
<%= ma.forge_message.description.html_safe %>
+ <% end %>
<%= time_tag(ma.created_at).html_safe %>
@@ -430,8 +448,10 @@
:onmouseout => "message_titile_hide($(this))" %>
主题:<%= ma.forge_message.subject %>
-
内容:
-
<%= ma.forge_message.content.html_safe %>
+ <% unless ma.forge_message.content.nil? %>
+
内容:
+
<%= ma.forge_message.content.html_safe %>
+ <% end %>
<% else %>
@@ -442,8 +462,10 @@
:onmouseout => "message_titile_hide($(this))" %>
主题:<%= ma.forge_message.subject %>
-
内容:
-
<%= ma.forge_message.content.html_safe %>
+ <% unless ma.forge_message.content.nil? %>
+
内容:
+
<%= ma.forge_message.content.html_safe %>
+ <% end %>
<% end %>
<%= time_tag(ma.created_at).html_safe %>
@@ -466,8 +488,10 @@
标题:<%= ma.forge_message.title %>
-
内容:
-
<%= ma.forge_message.description.html_safe %>
+ <% unless ma.forge_message.description.nil? %>
+
内容:
+
<%= ma.forge_message.description.html_safe %>
+ <% end %>
<%= time_tag(ma.created_at).html_safe %>
@@ -511,8 +535,10 @@
标题:<%= ma.memo.subject %>
-
内容:
-
<%= ma.memo.content.html_safe %>
+ <% unless ma.memo.content.nil? %>
+
内容:
+
<%= ma.memo.content.html_safe %>
+ <% end %>
<% else %>
@@ -522,8 +548,10 @@
标题:<%= ma.memo.subject %>
-
内容:
-
<%= ma.memo.content.html_safe %>
+ <% unless ma.memo.content.nil? %>
+
内容:
+
<%= ma.memo.content.html_safe %>
+ <% end %>
<% end %>
<%= time_tag(ma.memo.created_at).html_safe %>