From a282d8155199abc66ae6cdc28372a999d7253311 Mon Sep 17 00:00:00 2001
From: lizanle <491823689@qq.com>
Date: Mon, 10 Aug 2015 15:31:23 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8A=A0=E5=85=A5=E8=AF=BE=E7=A8=8B=E6=88=96?=
 =?UTF-8?q?=E8=80=85=E5=B7=B2=E7=BB=8F=E5=8A=A0=E5=85=A5=E7=9A=84=E8=AF=BE?=
 =?UTF-8?q?=E7=A8=8B=EF=BC=8C=E6=8F=90=E7=A4=BA=E5=90=8E=E8=BF=9B=E8=A1=8C?=
 =?UTF-8?q?=E8=B7=B3=E8=BD=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/courses_controller.rb | 11 ++++++++---
 app/views/courses/_set_join.js.erb    |  2 ++
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/app/controllers/courses_controller.rb b/app/controllers/courses_controller.rb
index 1623979f0..d9980e286 100644
--- a/app/controllers/courses_controller.rb
+++ b/app/controllers/courses_controller.rb
@@ -39,9 +39,14 @@ class CoursesController < ApplicationController
     else
       @state = 5 #未登录
     end
-    respond_to do |format|
-      format.js { render :partial => 'set_join', :locals => {:user => user, :course => course, :object_id => params[:object_id]} }
-    end
+    # if @state == 1 || @state == 3
+    #   respond_to course_path(course.id)
+    # else
+      respond_to do |format|
+        format.js { render :partial => 'set_join', :locals => {:user => user, :course => course, :object_id => params[:object_id]} }
+      end
+    #end
+
   rescue Exception => e
     @state = 4 #已经加入了课程
     respond_to do |format|
diff --git a/app/views/courses/_set_join.js.erb b/app/views/courses/_set_join.js.erb
index 0542f2a0c..5476e7ff0 100644
--- a/app/views/courses/_set_join.js.erb
+++ b/app/views/courses/_set_join.js.erb
@@ -6,12 +6,14 @@
 		alert("加入成功");
         hideModal($("#popbox02"));
         $("#try_join_course_link").replaceWith("<a href='<%=url_for(:controller => 'homework_common', :action => 'index',:course=>course.id, :host=>Setting.host_course)%>' target='_blank' class='blue_n_btn fr mt20'>提交作品</a>");
+        window.location.href= "http://"+"<%= Setting.host_name%>"+"/courses/" + "<%= course.id%>"
 	<% elsif @state == 1 %>
 		alert("密码错误");
 	<% elsif @state == 2 %>
 		alert("课程已过期\n请联系课程管理员重启课程。(在配置课程处)");
 	<% elsif @state == 3 %>
         alert("您已经加入了课程");
+        window.location.href= "http://"+"<%= Setting.host_name%>"+"/courses/" + "<%= course.id%>"
     <% elsif @state == 4 %>
         alert("您加入的课程不存在");
     <% elsif @state == 5 %>