From 39d014355b026d6b3adb317f329833987b331f53 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Fri, 13 May 2016 16:30:45 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A7=91=E5=A4=A7=E5=90=8D=E5=B8=88=EF=BC=8C?=
 =?UTF-8?q?=E5=92=8C=E5=90=8D=E5=B8=88=E5=88=97=E8=A1=A8=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E6=A0=87=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/organizations_controller.rb            |  1 +
 .../organizations/_org_left_subfield_list.html.erb     |  2 +-
 app/views/organizations/teachers.html.erb              | 10 ++++++++--
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/app/controllers/organizations_controller.rb b/app/controllers/organizations_controller.rb
index b48488fb8..c94f734e1 100644
--- a/app/controllers/organizations_controller.rb
+++ b/app/controllers/organizations_controller.rb
@@ -164,6 +164,7 @@ class OrganizationsController < ApplicationController
       return
     end
     q = params[:search].nil? ? "" : "#{params[:search].strip}"
+    @field = OrgSubfield.find(params[:org_subfield_id])
     @type = params[:type]
     if @type == "courses" || @type.nil?
       @org_teachers = User.find_by_sql("select u.*, ue.technical_title, ue.school_id,(select count(*) from courses where courses.tea_id = u.id) as course_count
diff --git a/app/views/organizations/_org_left_subfield_list.html.erb b/app/views/organizations/_org_left_subfield_list.html.erb
index 3fe57d223..4340213a4 100644
--- a/app/views/organizations/_org_left_subfield_list.html.erb
+++ b/app/views/organizations/_org_left_subfield_list.html.erb
@@ -102,7 +102,7 @@
                     <% end %>
                 <% else %>
                     <% if field.field_type == "Comptec" %>
-                        <%= link_to "#{field.name}", teachers_organization_path(organization), :class => "homepageMenuText homepageMenuControl hidden", :onclick => "$('#homepageLeftMenuPost').slideToggle();" %>
+                        <%= link_to "#{field.name}", teachers_organization_path(organization, :org_subfield_id => field.id), :class => "homepageMenuText homepageMenuControl hidden", :onclick => "$('#homepageLeftMenuPost').slideToggle();" %>
                     <% else %>
                         <%= link_to "#{field.name}", organization_path(organization, :org_subfield_id => field.id), :class => "homepageMenuText homepageMenuControl hidden", :onclick => "$('#homepageLeftMenuPost').slideToggle();" %>
                     <% end %>
diff --git a/app/views/organizations/teachers.html.erb b/app/views/organizations/teachers.html.erb
index 4b50a2a81..6e06124a4 100644
--- a/app/views/organizations/teachers.html.erb
+++ b/app/views/organizations/teachers.html.erb
@@ -1,5 +1,11 @@
 <div class="homepageRightBanner">
-  <div class="f16 fontGrey3">名师榜</div>
+  <div class="f16 fontGrey3">
+    <% if @type == "famous" %>
+      名师列表
+    <% else %>
+      <%= @field.name %>
+    <% end %>
+  </div>
 </div>
 <div class="resources mt10">
   <div class="function-row" id="org_teacher_search">
@@ -18,7 +24,7 @@
       <!--<option value="3">资源数</option>-->
     <!--</select>-->
     <div class="sn-font-grey fr">
-      <%= link_to "名师列表", teachers_organization_path(@organization, :type => "famous"), :class => "fontGrey" %>
+      <%= link_to "名师列表", teachers_organization_path(@organization, :type => "famous", :org_subfield_id => @field.id), :class => "fontGrey" %>
     </div>
     <div class="cl"></div>
   </div>