Merge branch 'develop' into szzh

app/views/users/_course_journalsformessage.html.erb

@@ -14,10 +14,10 @@
         <%= link_to course.name.to_s+" | 课程留言", course_feedback_path(course), :class => "newsBlue ml15" %>
       </div>
       <div class="homepagePostTitle break_word list_style upload_img">
-        <% if activity.m_parent_id.nil? %>
+        <% if activity.parent %>
-          <%= link_to activity.notes.html_safe, course_feedback_path(course), :class => "postGrey" %>
-        <% else %>
             <%= link_to activity.parent.notes.html_safe, course_feedback_path(course), :class => "postGrey" %>
+        <% else %>
+            <%= link_to activity.notes.html_safe, course_feedback_path(course), :class => "postGrey" %>
         <% end %>
       </div>
       <div class="homepagePostDate">