From ba658e44c015532385be505865f785c49206f19d Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Thu, 31 Mar 2016 20:46:55 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=84=E7=BB=87more=E6=9D=83=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/layouts/base_org_newstyle.html.erb | 22 ++++++++++++++++++--
 1 file changed, 20 insertions(+), 2 deletions(-)

diff --git a/app/views/layouts/base_org_newstyle.html.erb b/app/views/layouts/base_org_newstyle.html.erb
index 2a86f62b9..b5dfe71ea 100644
--- a/app/views/layouts/base_org_newstyle.html.erb
+++ b/app/views/layouts/base_org_newstyle.html.erb
@@ -259,7 +259,16 @@
                   <% if org_attachs.blank? %>
                       <p class="nocontent">暂无内容，敬请期待！</p>
                       <div class="cl"></div>
-                      <%= link_to "More", organization_path(@organization, :org_subfield_id => field.id), :class => "more-btn-center mt30" , :target => "_blank" %>
+                      <% 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 "More", show_subfield_without_id_path(:sub_dir_name => field.subfield_subdomain_dir.name), :class => "more-btn-center mt30", :target => "_blank" %>
+                          <% else %>
+                              <%= link_to "More", show_org_subfield_organization_path(:id => organization.id, :sub_dir_name => field.subfield_subdomain_dir.name), :class => "more-btn-center mt30", :target => "_blank"  %>
+                          <% end %>
+                      <% else %>
+                          <%= link_to "More", org_subfield_files_path(field), :class => "more-btn-center mt30", :target => "_blank"  %>
+                      <% end %>
+                      <%#= link_to "More", organization_path(@organization, :org_subfield_id => field.id), :class => "more-btn-center mt30" , :target => "_blank" %>
                       <div class="cl"></div>
                   <% else %>
                       <div class="row">
@@ -268,7 +277,16 @@
                       </div>
 
                       <div class="cl"></div>
-                      <%= link_to "More", organization_path(@organization, :org_subfield_id => field.id), :class => "more-btn-center mt30" , :target => "_blank" %>
+                      <% 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 "More", show_subfield_without_id_path(:sub_dir_name => field.subfield_subdomain_dir.name), :class => "more-btn-center mt30", :target => "_blank" %>
+                          <% else %>
+                              <%= link_to "More", show_org_subfield_organization_path(:id => organization.id, :sub_dir_name => field.subfield_subdomain_dir.name), :class => "more-btn-center mt30", :target => "_blank"  %>
+                          <% end %>
+                      <% else %>
+                          <%= link_to "More", org_subfield_files_path(field), :class => "more-btn-center mt30", :target => "_blank"  %>
+                      <% end %>
+                      <%#= link_to "More", organization_path(@organization, :org_subfield_id => field.id), :class => "more-btn-center mt30" , :target => "_blank" %>
                       <div class="cl"></div>
                   <% end %>