From 660cf7ef73d704aa81512d0c0c036b089beb177c Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Fri, 13 May 2016 14:52:33 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=8D=E5=B8=88=E5=88=97=E8=A1=A8=E5=B1=80?=
 =?UTF-8?q?=E9=83=A8=E6=90=9C=E7=B4=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/organizations_controller.rb         | 9 +++++----
 app/views/organizations/_org_teachers_list.html.erb | 2 +-
 app/views/organizations/teachers.html.erb           | 4 ++--
 app/views/organizations/teachers.js.erb             | 5 +++--
 4 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/app/controllers/organizations_controller.rb b/app/controllers/organizations_controller.rb
index 4747469cf..b48488fb8 100644
--- a/app/controllers/organizations_controller.rb
+++ b/app/controllers/organizations_controller.rb
@@ -164,16 +164,17 @@ class OrganizationsController < ApplicationController
       return
     end
     q = params[:search].nil? ? "" : "#{params[:search].strip}"
-    if params[:type] == "courses" || params[:type].nil?
+    @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
                                    from users u, user_extensions ue where u.id = ue.user_id and ue.identity=0 and concat(lastname,firstname,login) like '%#{q}%' order by course_count desc")
-    elsif params[:type] == "students"
+    elsif @type == "students"
       @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
                                    from users u, user_extensions ue where u.id = ue.user_id and ue.identity=0 and concat(lastname,firstname,login) like '%#{q}%' order by course_count desc")
-    elsif params[:type] == "resources"
+    elsif @type == "resources"
       @org_teachers = User.find_by_sql("select u.*, ue.technical_title, ue.school_id,(select count(*) from attachments where attachments.author_id = u.id) as course_count
                                    from users u, user_extensions ue where u.id = ue.user_id and ue.identity=0 and concat(lastname,firstname,login) like '%#{q}%' order by course_count desc")
-    elsif params[:type] == "famous"
+    elsif @type == "famous"
       @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
                                    from users u, user_extensions ue where u.id = ue.user_id and ue.identity=0 and u.excellent_teacher =1 and concat(lastname,firstname,login) like '%#{q}%' order by course_count desc")
     end
diff --git a/app/views/organizations/_org_teachers_list.html.erb b/app/views/organizations/_org_teachers_list.html.erb
index e24f53862..702675464 100644
--- a/app/views/organizations/_org_teachers_list.html.erb
+++ b/app/views/organizations/_org_teachers_list.html.erb
@@ -1,4 +1,4 @@
-<% @org_teachers.each do |org_teacher| %>
+<% org_teachers.each do |org_teacher| %>
     <% school = School.where("id =?", org_teacher.school_id).first %>
     <div class="teacher-list-row">
       <div>
diff --git a/app/views/organizations/teachers.html.erb b/app/views/organizations/teachers.html.erb
index 42dac9070..b3e311ade 100644
--- a/app/views/organizations/teachers.html.erb
+++ b/app/views/organizations/teachers.html.erb
@@ -1,6 +1,6 @@
 <div class="resources mt10">
-  <div class="function-row">
-    <%= form_tag( url_for(:controller => 'organizations', :action => 'teachers'),
+  <div class="function-row" id="org_teacher_search">
+    <%= form_tag( url_for(:controller => 'organizations', :action => 'teachers', :type => @type),
                   :remote => true , :method => 'get', :id => 'resource_search_form') do %>
         <input type="text" name="search" placeholder="输入教师名进行搜索" class="teacher-list-search fl" />
         <%= submit_tag '', :class => 'homepageSearchIcon', :onfocus => 'this.blur();', :class => "teacher-search-icon fl" %>
diff --git a/app/views/organizations/teachers.js.erb b/app/views/organizations/teachers.js.erb
index c2920716c..cd7323a4a 100644
--- a/app/views/organizations/teachers.js.erb
+++ b/app/views/organizations/teachers.js.erb
@@ -1,2 +1,3 @@
-$("#org_teachers_list").html('<%= escape_javascript( render :partial => 'organizations/org_teachers_list')%>');
-$("#pages").html('<%= pagination_links_full @atta_pages, @teachers_count, :per_page_links => false, :remote => @is_remote, :flag => true %>');
\ No newline at end of file
+$("#org_teachers_list").html('<%= escape_javascript( render :partial => 'organizations/org_teachers_list', :locals => {:org_teachers => @org_teachers})%>');
+$("#pages").html('<%= pagination_links_full @atta_pages, @teachers_count, :per_page_links => false, :remote => @is_remote, :flag => true %>');
+$("#org_teacher_search").attr('href','<%= teachers_organization_path(@organization, :type =>  @type) %>');
\ No newline at end of file