From 6e85b38b098cd0bec80eb31844a10d5559439087 Mon Sep 17 00:00:00 2001 From: ouyangxuhua Date: Fri, 26 Feb 2016 17:11:18 +0800 Subject: [PATCH] =?UTF-8?q?1.=E5=8D=9A=E5=AE=A2=E8=AE=BE=E4=B8=BA=E9=A6=96?= =?UTF-8?q?=E9=A1=B5=E5=90=8E=E8=BD=AC=E5=88=B0=E4=B8=AA=E4=BA=BA=E4=B8=BB?= =?UTF-8?q?=E9=A1=B5=EF=BC=9B2.=E7=BB=84=E7=BB=87=E6=A0=8F=E7=9B=AE?= =?UTF-8?q?=E8=AE=BE=E4=B8=BA=E9=A6=96=E9=A1=B5=E6=AD=A3=E7=A1=AE=E5=AE=9E?= =?UTF-8?q?=E7=8E=B0=E6=96=87=E7=AB=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/blogs_controller.rb | 2 +- app/views/org_subfields/_show_details.html.erb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/controllers/blogs_controller.rb b/app/controllers/blogs_controller.rb index 842433ec6..7a226f50d 100644 --- a/app/controllers/blogs_controller.rb +++ b/app/controllers/blogs_controller.rb @@ -29,7 +29,7 @@ class BlogsController < ApplicationController def set_homepage @blog = Blog.find(params[:id]) @blog.update_attribute(:homepage_id, params[:article_id]) - redirect_to user_blogs_path(params[:user_id]) + redirect_to user_path(params[:user_id]) end def cancel_homepage diff --git a/app/views/org_subfields/_show_details.html.erb b/app/views/org_subfields/_show_details.html.erb index 3a605f75d..f7f5d0748 100644 --- a/app/views/org_subfields/_show_details.html.erb +++ b/app/views/org_subfields/_show_details.html.erb @@ -42,7 +42,7 @@ }); <% if act.container_type == 'Organization' %> - <% if act.org_act_type == 'OrgDocumentComment' && act.org_act_id != @organization.home_id %> + <% if act.org_act_type == 'OrgDocumentComment' %> <%= render :partial => 'organizations/show_org_document', :locals => {:document => act.org_act, :act => act, :flag => 2, :org_subfield_id => params[:org_subfield_id]} %> <% end %> <% end %>