diff --git a/app/views/users/user_messages.html.erb b/app/views/users/user_messages.html.erb
index 16a1bdf4b..231403575 100644
--- a/app/views/users/user_messages.html.erb
+++ b/app/views/users/user_messages.html.erb
@@ -68,7 +68,7 @@
- <%= image_tag(url_to_avatar(ma.course_message.user), :width => "30", :height => "30") %>
- <%=link_to ma.course_message.user, user_path(ma.course_message.user), :class => "newsBlue" %>
- - 发布作业
+ - ">发布作业
-
<%= link_to ma.course_message.name, student_work_index_path(:homework => ma.course_message.id),:class => "newsGrey", :title => "#{ma.course_message.name}" %>
- <%= time_tag(ma.course_message.created_at).html_safe %>
@@ -111,7 +111,7 @@
- <%= image_tag(url_to_avatar(ma.course_message.user), :width => "30", :height => "30") %>
- <%=link_to ma.course_message.user, user_path(ma.course_message.user), :class => "newsBlue" %>
- - 评阅了作品
+ - ">评阅了作品
-
<%= link_to "#{ma.course_message.comment.nil? ? "分数:"+ma.course_message.score.to_s : "分数:"+ma.course_message.score.to_s + "----" + "评语:" + ma.course_message.comment}", student_work_index_path(:homework => ma.course_message.student_work.homework_common_id),:class=>"newsGrey",:title => "#{ma.course_message.comment}" %>
- <%= time_tag(ma.course_message.created_at).html_safe %>
@@ -121,7 +121,7 @@
- <%= image_tag(url_to_avatar(ma.course_message.user), :width => "30", :height => "30") %>
- <%=link_to ma.course_message.user, user_path(ma.course_message.user), :class => "newsBlue" %>
- - 回复了作品
+ - ">回复了作品
-
<%= link_to ma.course_message.notes, student_work_index_path(:homework => ma.course_message.jour.student_work.homework_common_id),:class=>"newsGrey",:title => "#{ma.course_message.notes}" %>
- <%= time_tag(ma.course_message.created_on).html_safe %>
@@ -186,7 +186,7 @@
-
<%=link_to ma.forge_message.author, user_path(ma.forge_message.author), :class => "newsBlue" %>
- - 发布新闻
+ - ">发布新闻
-
<%= link_to ("#{ma.forge_message.title.html_safe}"), {:controller => 'news', :action => 'show', :id => ma.forge_message.id}, :class => "newsGrey", :title => "#{ma.forge_message.title.html_safe}" %>
@@ -197,7 +197,7 @@
- <%= image_tag(url_to_avatar(ma.forge_message.author), :width => "30", :height => "30") %>
- <%=link_to ma.forge_message.author, user_path(ma.forge_message.author), :class => "newsBlue" %>
- - 回复了新闻
+ - ">回复了新闻
-
<%= link_to "#{ma.forge_message.comments.html_safe}",
{:controller => 'news', :action => 'show', :id => ma.forge_message.commented.id },:class =>"#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}", :title => "#{ma.forge_message.comments.html_safe}"%>
@@ -215,7 +215,7 @@
-
<%=link_to ma.memo.author, user_path(ma.memo.author), :class => "newsBlue" %>
- - <%= ma.memo.parent_id.nil? ? "新建贴吧帖子" : "回复贴吧帖子" %>
+ - " ><%= ma.memo.parent_id.nil? ? "新建贴吧帖子" : "回复贴吧帖子" %>
-
<%= link_to ma.memo.content.html_safe, forum_memo_path(ma.memo.forum_id, ma.memo.parent_id ? ma.memo.parent_id: ma.memo.id),:class => "newsGrey" , :title => "#{ma.memo.content.html_safe}" %>
@@ -233,7 +233,7 @@
-
<%=link_to ma.journals_for_message.user, user_path(ma.journals_for_message.user), :class => "newsBlue" %>
- - <%= ma.journals_for_message.reply_id == 0 ? "给你留言了" : "回复了你的留言" %>
+ - "><%= ma.journals_for_message.reply_id == 0 ? "给你留言了" : "回复了你的留言" %>
-
<%= link_to ma.journals_for_message.notes.html_safe, feedback_path(ma.journals_for_message.jour_id), :class => "newsGrey", :title => "#{ma.journals_for_message.notes}".html_safe %>
diff --git a/db/schema.rb b/db/schema.rb
index 791c5b14d..2a339c656 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -572,6 +572,16 @@ ActiveRecord::Schema.define(:version => 20150824133916) do
t.datetime "updated_at", :null => false
end
+ create_table "forum_messages", :force => true do |t|
+ t.integer "user_id"
+ t.integer "forum_id"
+ t.integer "memo_message_id"
+ t.string "memo_message_type"
+ t.integer "viewed"
+ t.datetime "created_at", :null => false
+ t.datetime "updated_at", :null => false
+ end
+
create_table "forums", :force => true do |t|
t.string "name", :null => false
t.text "description"