1.将作品评论、回复作品评论等加入至作业消息列表

app/controllers/users_controller.rb

@@ -130,7 +130,7 @@ class UsersController < ApplicationController
       when 'apply'
         @message_alls = ForgeMessage.where("forge_message_type =? and user_id =?" , "AppliedProject", @user).order("created_at desc")
       when 'homework'
-        @message_alls = CourseMessage.where("course_message_type =? and user_id =?", "HomeworkCommon", @user).order("created_at desc")
+        @message_alls = CourseMessage.where("course_message_type in ('HomeworkCommon','StudentWorksScore','JournalsForMessage') and user_id =?",  @user).order("created_at desc")
       when 'course_message'
         @message_alls = CourseMessage.where("course_message_type =? and user_id =?", "Message", @user).order("created_at desc")
       # when 'forge_message'

app/views/users/user_messages.html.erb

@@ -397,6 +397,7 @@
                 <% end %>
                 <% if ma.course_message_type == "JournalsForMessage" %>
                     <% if ma.course_message.jour_type == 'Course' %>
+                          <% if params[:type] != 'homework' %>
                               <ul class="homepageNewsList fl">
                                 <li class="homepageNewsPortrait fl">
                                   <a href="javascript:void(0);"><%= link_to image_tag(url_to_avatar(ma.course_message.user), :width => "30", :height => "30"), user_path(ma.course_message.user) %></a>
@@ -415,7 +416,7 @@
                                 </div>
                                 <li class="homepageNewsTime fl"><%= time_tag(ma.created_at).html_safe %> </li>
                               </ul>
-
+                          <% end %>
                     <% else %>
                         <ul class="homepageNewsList fl">
                           <li class="homepageNewsPortrait fl">