回复他人的博客首页不应跳到自己的博客首页

app/controllers/users_controller.rb

@@ -133,6 +133,7 @@ class UsersController < ApplicationController
         @user_activity_id = params[:user_activity_id]
         @activity_id = params[:activity_id]
         @homepage = params[:homepage]
+        @user_id = params[:user_id]
         @type = 'BlogComment'
       when 'OrgDocumentComment'
         @reply = OrgDocumentComment.find params[:reply_id]
@@ -3399,6 +3400,7 @@ class UsersController < ApplicationController
           @user_activity_id = params[:div_id].to_i if params[:div_id]
           @homepage = params[:homepage].to_i
           @type = 'BlogComment'
+          @user_id = obj.author_id
           comments = []
           @journals = get_all_children(comments, obj)
         when 'HomeworkCommon'

app/views/blog_comments/destroy.js.erb

@@ -1,5 +1,5 @@
 <% if @in_user_homepage %>
-    <% homepage = BlogComment.find(User.current.blog.homepage_id) %>
+    <% homepage = BlogComment.find(@user.blog.homepage_id) %>
     $("#user_activity_<%= @user_activity_id%>").replaceWith("<%= escape_javascript(render :partial => 'blogs/homepage', :locals => {:activity => @blog_comment, :user_activity_id => homepage.id}) %>");
 <% else%>
     $("#user_activity_<%= @user_activity_id%>").replaceWith("<%= escape_javascript(render :partial => 'users/user_blog', :locals => {:activity => @blog_comment,:user_activity_id =>@user_activity_id}) %>");

app/views/blogs/_homepage.html.erb

@@ -57,7 +57,7 @@
     <% comments = get_all_children(all_comments, activity)[0..2] %>
     <% if count > 0 %>
         <div class="" id="reply_div_<%= user_activity_id %>">
-          <%= render :partial => 'users/message_replies', :locals => {:comments => comments, :user_activity_id => user_activity_id, :type => 'BlogComment', :activity_id =>activity.id, :homepage => 1}%>
+          <%= render :partial => 'users/message_replies', :locals => {:comments => comments, :user_activity_id => user_activity_id, :type => 'BlogComment', :activity_id =>activity.id, :homepage => 1, :user_id => activity.author_id}%>
         </div>
     <% end %>
 

app/views/users/_message_replies.html.erb

@@ -82,7 +82,7 @@
                       <span style="position: relative" class="fr mr20">
                         <%= link_to(
                                     l(:button_reply),
-                                    {:controller => 'users' ,:action => 'reply_to', :reply_id => comment.id, :type => type, :user_activity_id => user_activity_id, :activity_id => activity_id, :homepage => homepage},
+                                    {:controller => 'users' ,:action => 'reply_to', :reply_id => comment.id, :type => type, :user_activity_id => user_activity_id, :activity_id => activity_id, :homepage => homepage, :user_id => user_id},
                                     :remote => true,
                                     :method => 'get',
                                     :title => l(:button_reply))  if !comment.root.locked? %>
@@ -91,7 +91,7 @@
                       <% if comment.author == User.current %>
                         <%= link_to(
                                   l(:button_delete),
-                                  {:controller => 'blog_comments',:action => 'destroy', :id => comment.id, :user_activity_id => user_activity_id, :homepage => homepage},
+                                  {:controller => 'blog_comments',:action => 'destroy', :id => comment.id, :user_activity_id => user_activity_id, :homepage => homepage, :user_id => user_id},
                                   :method => :delete,
                                   :remote => true,
                                   :class => 'fr mr20',

app/views/users/_reply_to.html.erb

@@ -42,7 +42,7 @@
                   <p nhname='contentmsg_<%= reply.id%>'></p>
               <% end%>
           <% elsif @type == 'BlogComment' %>
-              <%= form_for('new_form', :url => {:controller => 'blog_comments',:action => 'reply', :id => reply.id, :blog_id => reply.blog.id, :user_id => User.current.id}, :method => "post", :remote => true) do |f| %>
+              <%= form_for('new_form', :url => {:controller => 'blog_comments',:action => 'reply', :id => reply.id, :blog_id => reply.blog.id, :user_id => @user_id}, :method => "post", :remote => true) do |f| %>
                   <input type="hidden" name="blog_comment[title]" value="RE:<%=(BlogComment.find @activity_id).title %>" id="reply_subject">
                   <%= hidden_field_tag 'user_activity_id',params[:user_activity_id],:value =>@user_activity_id %>
                   <%= hidden_field_tag 'parent_id', params[:parent_id], :value => reply.id %>

app/views/users/all_journals.js.erb

@@ -5,7 +5,7 @@ $('#reply_div_<%= @user_activity_id %>').html('<%=escape_javascript(render :part
 <% elsif params[:type] == 'Message' %>
 $('#reply_div_<%= params[:div_id].to_i %>').html('<%=escape_javascript(render :partial => 'users/message_replies', :locals => {:comments => @journals,:user_activity_id => @user_activity_id, :type => @type, :activity_id => params[:id].to_i,:is_course => @is_course, :is_board => @is_board}) %>');
 <% elsif params[:type] == 'BlogComment' %>
-$('#reply_div_<%= params[:div_id].to_i %>').html('<%=escape_javascript(render :partial => 'users/message_replies', :locals => {:comments => @journals,:user_activity_id => @user_activity_id, :type => @type, :activity_id => params[:id].to_i, :homepage => @homepage}) %>');
+$('#reply_div_<%= params[:div_id].to_i %>').html('<%=escape_javascript(render :partial => 'users/message_replies', :locals => {:comments => @journals,:user_activity_id => @user_activity_id, :type => @type, :activity_id => params[:id].to_i, :homepage => @homepage, :user_id => @user_id}) %>');
 <% elsif params[:type] == 'OrgDocumentComment' %>
 $('#reply_div_<%= params[:div_id].to_i %>').html('<%=escape_javascript(render :partial => 'users/message_replies', :locals => {:comments => @journals, :user_activity_id => @user_activity_id, :type => @type, :activity_id => params[:id].to_i}) %>');
 <% elsif params[:type] == 'News' || params[:type] == 'Issue' || params[:type] == 'Syllabus' %>