From 49beaa4f42c3285c537eed9b98a2edebeb21f4a6 Mon Sep 17 00:00:00 2001
From: z9hang <z9hang@126.com>
Date: Fri, 24 Oct 2014 10:47:20 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E5=8E=BB=E6=8E=89ajax=E9=94=99=E8=AF=AF?=
 =?UTF-8?q?=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/files/index.html.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/files/index.html.erb b/app/views/files/index.html.erb
index 9d6d9f2b3..fcf54de75 100644
--- a/app/views/files/index.html.erb
+++ b/app/views/files/index.html.erb
@@ -54,7 +54,7 @@
         if (textStatus == 'success') {
             eval(xhr.responseText);
         } else if (textStatus == 'error') {
-            alert('error');
+//            alert('error');
         }
     }
 

From 526b34d623cea2bd0850c6b6d89634757a397f7f Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Fri, 24 Oct 2014 11:26:41 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8A=A0=E5=85=A5?=
 =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E5=BC=B9=E5=87=BA=E6=A1=86=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/courses/join_private_courses.js.erb | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/views/courses/join_private_courses.js.erb b/app/views/courses/join_private_courses.js.erb
index 7bbb5ee99..0cf723f6b 100644
--- a/app/views/courses/join_private_courses.js.erb
+++ b/app/views/courses/join_private_courses.js.erb
@@ -1,4 +1,3 @@
 $('#ajax-modal').html('<%= escape_javascript(render :partial => 'join_private_course') %>');
 showModal('ajax-modal', '510px');
-$('#ajax-modal').addClass('new-watcher');
 $('#ajax-modal').css('height','330px');
\ No newline at end of file

From e6d1a127a96a40b8d811e0ae3e4d8ab8f2905cb5 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Fri, 24 Oct 2014 11:37:39 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E5=A4=8DMicros=E7=89=88=E5=AD=A6?=
 =?UTF-8?q?=E6=A0=A1=E5=88=97=E8=A1=A8=E6=97=A0=E6=B3=95=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E7=9A=84BUG?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/school/index.html.erb | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/views/school/index.html.erb b/app/views/school/index.html.erb
index 15a76a3d4..97035ebc2 100644
--- a/app/views/school/index.html.erb
+++ b/app/views/school/index.html.erb
@@ -5,7 +5,7 @@
 		$("#province").html("<option value='0' selected = true style='display: none;'></option>");
 		$.ajax({
 			type :"POST",
-			url :'/school/get_province',
+			url :'http://<%= Setting.host_name %>/school/get_province',
 			data: "send",
 			success: function(data, textStatus){
 				
@@ -22,7 +22,7 @@
 	function get_school(value){
  		$.ajax({
  			type :"POST",
- 			url :'/school/get_schoollist/'+encodeURIComponent(value),
+ 			url :'http://<%= Setting.host_name %>/school/get_schoollist/'+encodeURIComponent(value),
  			data :'text', 
  			success: function(data){
  				$("#schoollist").html(data);
@@ -39,7 +39,7 @@
 
 <script type="text/javascript">
 	function test(id){
-        location.href = encodeURI('http://<%= Setting.host_course %>/?school_id='+id);
+        location.href = encodeURI('http://<%= Setting.host_name %>/?school_id='+id);
 	}
 
 </script>
@@ -57,7 +57,7 @@
 		//alert(province);
 		$.ajax({
  			type :"POST",
- 			url :'/school/search_school/?key_word='+encodeURIComponent(value)+'&province='+province,
+ 			url :'http://<%= Setting.host_name %>/school/search_school/?key_word='+encodeURIComponent(value)+'&province='+province,
  			data :'text', 
  			success: function(data){
  				$("#schoollist").html(data);
@@ -80,7 +80,7 @@
 
 		<%= link_to l(:label_all_schol),school_index_path  %>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
         <% if User.current.logged? %>
-          <a href="http://<%= Setting.host_course %>"><%= l(:label_my_school) %></a>
+          <a href="http://<%= Setting.host_name %>"><%= l(:label_my_school) %></a>
         <% end %>
 	</p>
 		<ul>