From 3565e0bf6fca8301938631a7dba0ae363258ce54 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Thu, 5 May 2016 16:59:06 +0800
Subject: [PATCH] =?UTF-8?q?base=E5=B7=A6=E4=BE=A7=E9=93=BE=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../organizations/_org_left_subfield_list.html.erb    | 11 +++--------
 .../sub_document_comments/_show_sub_document.html.erb |  4 ++--
 2 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/app/views/organizations/_org_left_subfield_list.html.erb b/app/views/organizations/_org_left_subfield_list.html.erb
index a37d176eb..422b5aca8 100644
--- a/app/views/organizations/_org_left_subfield_list.html.erb
+++ b/app/views/organizations/_org_left_subfield_list.html.erb
@@ -96,22 +96,17 @@
                 <!--<a href="javascript:void(0);" class="homepageMenuText" onclick="$('#homepageLeftMenuProjects').slideToggle();">项目</a>-->
                 <% if !field.subfield_subdomain_dir.nil? %> <!--讨论帖子-->
                     <% if !request.local? and Secdomain.where("sub_type=2 and pid=?", organization.id).count > 0 and Secdomain.where("sub_type=2 and pid=?", organization.id).map(&:subname).include?(request.subdomain) %>
-                        <a href="javascript:void(0);" class="homepageMenuText" onclick="$('#homepageLeftMenuPost').slideToggle();"><%= field.name %></a>
-                        <%#= link_to "#{field.name}", show_subfield_without_id_path(:sub_dir_name => field.subfield_subdomain_dir.name), :class => "homepageMenuText", :onclick => "$('#homepageLeftMenuPost').slideToggle();" %>
+                        <%= link_to "#{field.name}", show_subfield_without_id_path(:sub_dir_name => field.subfield_subdomain_dir.name), :class => "homepageMenuText", :onclick => "$('#homepageLeftMenuPost').slideToggle();" %>
                     <% else %>
-                        <a href="javascript:void(0);" class="homepageMenuText" onclick="$('#homepageLeftMenuPost').slideToggle();"><%= field.name %></a>
-                        <%#= link_to "#{field.name}", show_org_subfield_organization_path(:id => organization.id, :sub_dir_name => field.subfield_subdomain_dir.name), :class => "homepageMenuText", :onclick => "$('#homepageLeftMenuPost').slideToggle();" %>
+                        <%= link_to "#{field.name}", show_org_subfield_organization_path(:id => organization.id, :sub_dir_name => field.subfield_subdomain_dir.name), :class => "homepageMenuText", :onclick => "$('#homepageLeftMenuPost').slideToggle();" %>
                     <% end %>
                 <% else %>
-                    <a href="javascript:void(0);" class="homepageMenuText" onclick="$('#homepageLeftMenuPost').slideToggle();"><%= field.name %></a>
-                    <%#= link_to "#{field.name}", organization_path(organization, :org_subfield_id => field.id), :class => "homepageMenuText", :onclick => "$('#homepageLeftMenuPost').slideToggle();" %>
+                    <%= link_to "#{field.name}", organization_path(organization, :org_subfield_id => field.id), :class => "homepageMenuText", :onclick => "$('#homepageLeftMenuPost').slideToggle();" %>
                 <% end %>
-
                 <% if User.current.logged? and User.current.admin_of_org?(organization) %>
                     <%=link_to "", new_organization_org_document_comment_path(organization, :field_id => field.id), :method => "get", :class => "homepageMenuSetting fr", :title => "发布帖子" %>
                 <% end %>
               </div>
-
               <div class="<%= field.sub_domains.count == 0?'homepageLeftMenuCourses':'homepageLeftMenuCourses borderBottomNone' %>" id="homepageLeftMenuPost" style="display:none;">
                 <ul>
                   <%= render :partial => 'organizations/org_subdomain',:locals=>{:subdomains => field.sub_domains.reorder('created_at').uniq.limit(5), :org_subfield_id => field.id} %>
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 c71e14a0c..438a98f23 100644
--- a/app/views/sub_document_comments/_show_sub_document.html.erb
+++ b/app/views/sub_document_comments/_show_sub_document.html.erb
@@ -7,9 +7,9 @@
     <div class="homepagePostDes">
       <div class="homepagePostTo">
         <%= link_to User.find(document.creator_id), user_url_in_org(document.creator.id), :class => "newsBlue mr15" %>
-        TO&nbsp;&nbsp;<%= link_to document.sub_domain.name, organization_path(@organization), :class => "newsBlue" %>
+        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;"><%=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>
         <%# if document.organization.home_id == document.id %>
             <!--<span class="red_homework_btn_cir ml5">已设为首页</span>-->
         <%# end %>