From d0db7114499fb434f49709d2f26838a95043da49 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Thu, 5 May 2016 18:47:32 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BC=96=E8=BE=91=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/sub_document_comments_controller.rb         | 5 ++---
 app/views/sub_document_comments/_show_sub_document.html.erb | 6 +++---
 config/routes.rb                                            | 2 +-
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/app/controllers/sub_document_comments_controller.rb b/app/controllers/sub_document_comments_controller.rb
index 9bd0db8de..55a98e5b0 100644
--- a/app/controllers/sub_document_comments_controller.rb
+++ b/app/controllers/sub_document_comments_controller.rb
@@ -1,5 +1,5 @@
 class SubDocumentCommentsController < ApplicationController
-  before_filter :find_subdomain_and_subfield, :only => [:new, :create, :show, :index, :destroy]
+  before_filter :find_subdomain_and_subfield, :only => [:new, :create, :show, :index, :destroy, :edit]
   before_filter :find_subfield_content, :only => [:show, :index]
   helper :attachments,:organizations
   layout 'base_sub_domain'
@@ -90,9 +90,8 @@ class SubDocumentCommentsController < ApplicationController
   end
 
   def edit
-    @org_document = SubDocumentComment.find(params[:id])
+    @sub_document = SubDocumentComment.find(params[:id])
     @flag = params[:flag]
-    @organization = Organization.find(params[:organization_id])
   end
 
   def add_reply
diff --git a/app/views/sub_document_comments/_show_sub_document.html.erb b/app/views/sub_document_comments/_show_sub_document.html.erb
index 1da06b510..0027417ab 100644
--- a/app/views/sub_document_comments/_show_sub_document.html.erb
+++ b/app/views/sub_document_comments/_show_sub_document.html.erb
@@ -9,12 +9,12 @@
         <%= link_to User.find(document.creator_id), user_url_in_org(document.creator.id), :class => "newsBlue mr15" %>
         TO&nbsp;&nbsp;<%= link_to @organization.name, organization_path(@organization), :class => "newsBlue" %>
         |
-        <span style="color:#269ac9;"><%=link_to document.sub_domain.name, org_subfield_sub_domain_sub_document_comment_path(document, :org_subfield_id=> @org_subfield.id, :sub_domain_id => document.sub_domain.id), :class => "newsBlue"  %></span>
+        <span style="color:#269ac9;"><a class="newsBlue"><%= document.sub_domain.name %></a></span>
         <%# if document.organization.home_id == document.id %>
             <!--<span class="red_homework_btn_cir ml5">已设为首页</span>-->
         <%# end %>
       </div>
-      <div class="homepagePostTitle postGrey"><a><% document.title %></a></div>
+      <div class="homepagePostTitle postGrey"><a><%= link_to document.title, org_subfield_sub_domain_sub_document_comment_path(document, :org_subfield_id=> @org_subfield.id, :sub_domain_id => document.sub_domain.id) %></a></div>
       <div class="homepagePostDate fl">
         发布时间：<%= format_activity_day(document.created_at) %> <%= format_time(document.created_at, false) %>
       </div>
@@ -46,7 +46,7 @@
                     <!--<%# end %>-->
                   <!--</li>-->
                   <li>
-                    <%= link_to "编辑文章", org_subfield_sub_domain_sub_document_comment_path(document, :org_subfield_id=> params[:org_subfield_id], :sub_domain_id => document.sub_domain.id, :flag => flag), :method => 'edit', :class => "postOptionLink" %>
+                    <%= link_to "编辑文章", edit_org_subfield_sub_domain_sub_document_comment_path(document, :org_subfield_id=> params[:org_subfield_id], :sub_domain_id => document.sub_domain.id, :flag => flag), :method => 'update', :class => "postOptionLink" %>
                   </li>
                   <li>
                     <%= link_to "删除文章", org_subfield_sub_domain_sub_document_comment_path(document, :org_subfield_id=> params[:org_subfield_id], :sub_domain_id => document.sub_domain.id, :flag => flag), :method => 'delete',
diff --git a/config/routes.rb b/config/routes.rb
index 14e3b409d..903cd9a7e 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -126,9 +126,9 @@ RedmineApp::Application.routes.draw do
           post 'reply'
           post 'add_reply_in_doc'
           delete 'delete_reply'
+          get 'edit'
         end
         collection do
-
         end
       end