From aab9594ac9a533792e70123f681bcf101c764f79 Mon Sep 17 00:00:00 2001 From: ouyangxuhua Date: Thu, 10 Dec 2015 17:22:59 +0800 Subject: [PATCH] =?UTF-8?q?1.=E8=A7=A3=E5=86=B3=E8=8B=B1=E6=96=87=E7=89=88?= =?UTF-8?q?=E4=B8=8B=EF=BC=8C=E7=BB=84=E7=BB=87=E6=88=90=E5=91=98=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E7=BC=96=E8=BE=91=E6=88=90=E5=91=98=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E9=94=99=E8=AF=AF=EF=BC=9B=202.=E8=A7=A3=E5=86=B3=E5=9C=A8?= =?UTF-8?q?=E7=BB=84=E7=BB=87=E6=96=87=E7=AB=A0=E8=AF=A6=E6=83=85=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=EF=BC=8C=E5=88=A0=E9=99=A4=E6=96=87=E7=AB=A0=E6=8A=A5?= =?UTF-8?q?=E9=94=99=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/org_document_comments/destroy.js.erb | 7 +++++-- app/views/org_document_comments/show.html.erb | 2 +- app/views/organizations/_org_member_list.html.erb | 12 ++++-------- 3 files changed, 10 insertions(+), 11 deletions(-) diff --git a/app/views/org_document_comments/destroy.js.erb b/app/views/org_document_comments/destroy.js.erb index d35489452..787bd3185 100644 --- a/app/views/org_document_comments/destroy.js.erb +++ b/app/views/org_document_comments/destroy.js.erb @@ -1,3 +1,6 @@ //location.reload(); -//window.location.href = '<%#= organization_org_document_comments_path(:organization_id => @org_document_comment.root.organization_id)%>' -window.location.reload(); \ No newline at end of file +<% if params[:detail_page] %> + window.location.href = '<%= organization_org_document_comments_path(:organization_id => @org_document_comment.root.organization_id)%>'; +<% else %> + window.location.reload(); +<% end %> \ No newline at end of file diff --git a/app/views/org_document_comments/show.html.erb b/app/views/org_document_comments/show.html.erb index 7655f996e..7a64e4514 100644 --- a/app/views/org_document_comments/show.html.erb +++ b/app/views/org_document_comments/show.html.erb @@ -46,7 +46,7 @@ <%= link_to "编辑文章", edit_org_document_comment_path(:id => @document.id, :organization_id => @document.organization_id, :flag => 1), :class => "postOptionLink" %>
  • - <%= link_to "删除文章", org_document_comment_path(:id => @document.id, :organization_id => @document.organization_id), :method => 'delete', + <%= link_to "删除文章", org_document_comment_path(:id => @document.id, :organization_id => @document.organization_id, :detail_page => 1), :method => 'delete', :data => {:confirm => l(:text_are_you_sure)}, :remote => true, :class => 'postOptionLink' %>
    • diff --git a/app/views/organizations/_org_member_list.html.erb b/app/views/organizations/_org_member_list.html.erb index f67b25811..f5a277634 100644 --- a/app/views/organizations/_org_member_list.html.erb +++ b/app/views/organizations/_org_member_list.html.erb @@ -11,14 +11,10 @@