From 7be18b80b4ad459f6272cb6b2e97c7ff8be75808 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Fri, 3 Jun 2016 13:45:53 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=84=E7=BB=87=E9=93=BE=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../organizations/_org_custom_header.html.erb      | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/app/views/organizations/_org_custom_header.html.erb b/app/views/organizations/_org_custom_header.html.erb
index 6368fef90..cc6920f33 100644
--- a/app/views/organizations/_org_custom_header.html.erb
+++ b/app/views/organizations/_org_custom_header.html.erb
@@ -43,7 +43,17 @@
 
         <% else %>
             <% if field.field_type == "Post" && field.hide == 0 %>
-                <li><a href="#message_<%= field.id %>" class="sn-link-white"><%= field.name %></a></li>
+                <li>
+                  <% 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) %>
+                          <%= link_to field.name, show_subfield_without_id_path(:sub_dir_name => field.subfield_subdomain_dir.name), :class => "sn-link-white", :target => "_blank" %>
+                      <% else %>
+                          <%= link_to field.name, show_org_subfield_organization_path(:id => @organization.id, :sub_dir_name => field.subfield_subdomain_dir.name), :class => "sn-link-white", :target => "_blank" %>
+                      <% end %>
+                  <% else %>
+                      <%= link_to field.name, organization_path(@organization, :org_subfield_id => field.id), :class => "sn-link-white", :target => "_blank" %>
+                  <% end %>
+                </li>
                 <!--二级目录-->
                 <div class="sn-row sn-subnav-position sn-grey-opacity" style="display:none;">
                   <ul class="sn-sub-nav" style="display:<%= if_hidden_subdomain( field) ? 'block':'none' %>;">
@@ -55,7 +65,7 @@
                 </div>
             <% elsif field.field_type == "Resource" && field.hide == 0 %>
                 <li class="nav-element">
-                  <a href="#resource_<%= field.id %>" class="sn-link-white"><%= field.name %></a>
+                  <%= link_to field.name, org_subfield_files_path(field), :class => "sn-link-white", :target => "_blank" %>
                 </li>
             <% end %>
         <% end %>