From c6aaaff8d19d379fbe2fe3ab5b10c092890e2e60 Mon Sep 17 00:00:00 2001
From: ouyangxuhua <ouyangxuhua167@163.com>
Date: Mon, 18 Jan 2016 10:07:12 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AF=B9=E6=9C=89=E5=AD=90=E5=9F=9F=E5=90=8D?=
 =?UTF-8?q?=E7=9A=84=E7=BB=84=E7=BB=87=EF=BC=8C=E6=A0=8F=E7=9B=AE=E7=9A=84?=
 =?UTF-8?q?=E9=93=BE=E6=8E=A5=E5=BA=94=E4=B8=8D=E5=90=AB=E6=9C=89=E7=BB=84?=
 =?UTF-8?q?=E7=BB=87=E5=8F=8A=E5=85=B6id?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../organizations/_org_left_subfield_list.html.erb   | 12 ++++++++++--
 config/routes.rb                                     |  1 +
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/app/views/organizations/_org_left_subfield_list.html.erb b/app/views/organizations/_org_left_subfield_list.html.erb
index 7956af6d1..ffd86baa3 100644
--- a/app/views/organizations/_org_left_subfield_list.html.erb
+++ b/app/views/organizations/_org_left_subfield_list.html.erb
@@ -71,7 +71,11 @@
     <div class="homepageLeftMenuBlock" style="display:<%= field.hide == 0?'block':'none' %>;" id="org_subfield_<%= field.id %>">
       <% if field.field_type == "Post" %>
           <% if !field.subfield_subdomain_dir.nil? %>
-              <%= link_to "#{field.name}", show_org_subfield_organization_path(:id => organization.id, :sub_dir_name => field.subfield_subdomain_dir.name), :class => "homepageMenuText" %>
+              <% if !request.local? and !organization.domain.nil? and Organization.where("domain is not null").map(&:domain).include?(request.subdomain) %>
+                  <%= link_to "#{field.name}", show_subfield_without_id_path(:sub_dir_name => field.subfield_subdomain_dir.name), :class => "homepageMenuText" %>
+              <% else %>
+                  <%= link_to "#{field.name}", show_org_subfield_organization_path(:id => organization.id, :sub_dir_name => field.subfield_subdomain_dir.name), :class => "homepageMenuText" %>
+              <% end %>
           <% else %>
               <%= link_to "#{field.name}", organization_path(organization, :org_subfield_id => field.id), :class => "homepageMenuText" %>
           <% end %>
@@ -80,7 +84,11 @@
        <% end %>
       <% else %>
         <% if !field.subfield_subdomain_dir.nil? %>
-          <%= link_to "#{field.name}", show_org_subfield_organization_path(:id => organization.id, :sub_dir_name => field.subfield_subdomain_dir.name), :class => "homepageMenuText" %>
+          <% if !request.local? and !organization.domain.nil? and Organization.where("domain is not null").map(&:domain).include?(request.subdomain) %>
+            <%= link_to "#{field.name}", show_subfield_without_id_path(:sub_dir_name => field.subfield_subdomain_dir.name), :class => "homepageMenuText" %>
+          <% else %>
+            <%= link_to "#{field.name}", show_org_subfield_organization_path(:id => organization.id, :sub_dir_name => field.subfield_subdomain_dir.name), :class => "homepageMenuText" %>
+          <% end %>
         <% else %>
           <%= link_to "#{field.name}", org_subfield_files_path(field), :class => "homepageMenuText" %>
         <% end %>
diff --git a/config/routes.rb b/config/routes.rb
index ed1913c28..ce5b09aec 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -73,6 +73,7 @@ RedmineApp::Application.routes.draw do
     end
   end
 
+  get '/:sub_dir_name', :to => 'org_subfields#show', :as => 'show_subfield_without_id'
   constraints(Subdomain.new) do
     get '/', to: 'organizations#show'
   end