Merge branch 'develop' into sw_new_course

app/controllers/users_controller.rb

@@ -45,7 +45,7 @@ class UsersController < ApplicationController
     :activity_new_score_index, :influence_new_score_index, :score_new_index,:update_score,:user_activities,:user_projects_index,
     :user_courses4show,:user_projects4show,:user_course_activities,:user_project_activities,:user_feedback4show,:user_visitorlist,
     :user_resource,:user_resource_create,:user_resource_delete,:rename_resource,:search_user_course,:add_exist_file_to_course,
-    :search_user_project,:resource_preview,:resource_search,:add_exist_file_to_project]
+    :search_user_project,:resource_preview,:resource_search,:add_exist_file_to_project,:user_messages]
   #edit has been deleted by huang, 2013-9-23
   before_filter :find_user, :only => [:user_fanslist, :user_watchlist, :show, :edit, :update, :destroy, :edit_membership, :user_courses,
                                   :user_homeworks, :destroy_membership, :user_activities, :user_projects, :user_newfeedback, :user_comments,

app/views/users/user_messages.html.erb

@@ -228,7 +228,7 @@
     <%# 用户留言消息 %>
     <% unless @user_feedback_messages.nil? %>
         <% @user_feedback_messages.each do |ufm| %>
-            <% if ufm.journals_for_message_type == "Principal" %>
+            <% if ufm.journals_for_message_type == "JournalsForMessage" %>
                 <ul class="homepageNewsList fl">
                   <li class="homepageNewsPortrait fl">
                     <a href="javascript:void(0);"><%= image_tag(url_to_avatar(ufm.journals_for_message.user), :width => "30", :height => "30") %></a>