From 3e185c3a4bd9ccc8e904b56a397c701bb68b4907 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Thu, 3 Jul 2014 18:11:10 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AD=A6=E6=A0=A1=E9=93=BE?=
 =?UTF-8?q?=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/school_controller.rb |  2 +-
 app/views/school/index.html.erb      | 16 ++++++++++++----
 config/routes.rb                     |  2 +-
 3 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/app/controllers/school_controller.rb b/app/controllers/school_controller.rb
index ec14ba5c..c8b495fe 100644
--- a/app/controllers/school_controller.rb
+++ b/app/controllers/school_controller.rb
@@ -105,7 +105,7 @@ class SchoolController < ApplicationController
     end
     options = ""
     @school.each do |s|
-      options << "<li style = 'width: 33%; float: left'><a id=#{s.id} onclick='test(this.id)'>#{s.name}</a></li>"
+      options << "<li style = 'width: 33%; float: left'> <a id=#{s.id} onclick='test(this.id)'>#{s.name}</a></li>"
     end
      
      render :text => options    
diff --git a/app/views/school/index.html.erb b/app/views/school/index.html.erb
index fa5d846e..b59678df 100644
--- a/app/views/school/index.html.erb
+++ b/app/views/school/index.html.erb
@@ -44,8 +44,16 @@
 <script type="text/javascript">
 	function test(id){
 
-		location.href = encodeURI('http://course.trustie.net<%=port%>?school_id='+id);
+        $.ajax({
+            url: '<%=school_course_list_path%>',
+            type: "POST",
+            data: {
+                school_id: id
+            }
+
+        }).complete(eval_ajax);
 	}
+
 </script>
 <script type="text/javascript">
 	function ssearch(){
@@ -70,8 +78,8 @@
 <div>
 	<p>
 
-		<a href="http://course.trustie.net<%=port%>?school_id=0">全部学校</a>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-      <%= link_to '我的学校',scholl_course_list_path(User.current.user_extensions.school)  %>
+		<%= link_to "全部学校",school_index_path  %>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+      <%= link_to '我的学校',school_course_list_path(User.current.user_extensions.school)  %>
 	</p>
 		<ul>
 			<li style="width: 40%; float: left">请选择省份:
@@ -85,7 +93,7 @@
 <div style="clear: both"></div>
 <div>
 	<ul id="schoollist" style="line-height: 25px">
-		
+
 	</ul>
 </div>
 
diff --git a/config/routes.rb b/config/routes.rb
index b087b3bd..8318a239 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -700,7 +700,7 @@ RedmineApp::Application.routes.draw do
   #######confusing########
   get 'welcome/search', to: 'welcome#search'
   get 'school/index', to: 'school#index'
-  get 'course/:school_id', to: 'welcome#course', :as => 'scholl_course_list'
+  get 'course/:school_id', to: 'welcome#course', :as => 'school_course_list'
   #get 'course/:school_id', to: 'welcome#course'
   post 'school/get_options/:province', :to => 'school#get_options'
   get 'school/get_options/:province', :to => 'school#get_options'