From 78fb8b6254221b499af50394f4e82237fc95bc15 Mon Sep 17 00:00:00 2001
From: ouyangxuhua <ouyangxuhua167@163.com>
Date: Wed, 9 Dec 2015 16:19:52 +0800
Subject: [PATCH] =?UTF-8?q?1.=E7=BC=96=E8=BE=91=E6=88=96=E8=80=85=E5=88=A0?=
 =?UTF-8?q?=E9=99=A4=E6=A0=8F=E7=9B=AE=E7=9A=84=E5=B8=96=E5=AD=90=E8=BF=94?=
 =?UTF-8?q?=E5=9B=9E=E5=AF=B9=E5=BA=94=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/models/org_subfield.rb                          | 2 +-
 app/views/org_document_comments/destroy.js.erb      | 3 ++-
 app/views/organizations/_show_org_document.html.erb | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/app/models/org_subfield.rb b/app/models/org_subfield.rb
index 087120b69..efe9699c3 100644
--- a/app/models/org_subfield.rb
+++ b/app/models/org_subfield.rb
@@ -1,4 +1,4 @@
 class OrgSubfield < ActiveRecord::Base
   belongs_to :organization, :foreign_key => :organization_id
-  has_many :org_document_comments
+  has_many :org_document_comments, :dependent => :destroy
 end
\ No newline at end of file
diff --git a/app/views/org_document_comments/destroy.js.erb b/app/views/org_document_comments/destroy.js.erb
index adbeff4a6..d35489452 100644
--- a/app/views/org_document_comments/destroy.js.erb
+++ b/app/views/org_document_comments/destroy.js.erb
@@ -1,2 +1,3 @@
 //location.reload();
-window.location.href = '<%= organization_org_document_comments_path(:organization_id => @org_document_comment.root.organization_id)%>'
\ No newline at end of file
+//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
diff --git a/app/views/organizations/_show_org_document.html.erb b/app/views/organizations/_show_org_document.html.erb
index 7a87c55a0..2b0f11cdd 100644
--- a/app/views/organizations/_show_org_document.html.erb
+++ b/app/views/organizations/_show_org_document.html.erb
@@ -32,7 +32,7 @@
                     <% end %>
                   </li>
                   <li>
-                    <%= link_to "编辑文章", edit_org_document_comment_path(:id => document.id, :organization_id => document.organization_id, :flag => flag, :org_subfield_id => org_subfield_id), :class => "postOptionLink" %>
+                    <%= link_to "编辑文章", edit_org_document_comment_path(:id => document.id, :organization_id => document.organization_id, :flag => flag, :org_subfield_id => params[:org_subfield_id] ), :class => "postOptionLink" %>
                   </li>
                   <li>
                     <%= link_to "删除文章", org_document_comment_path(:id => document.id, :organization_id => document.organization_id), :method => 'delete',