From 19634342422036d5574096bd14f7608053fcb9d2 Mon Sep 17 00:00:00 2001
From: ouyangxuhua <ouyangxuhua167@163.com>
Date: Thu, 29 Oct 2015 16:35:23 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E6=90=9C=E7=B4=A2=E8=AF=BE?=
 =?UTF-8?q?=E7=A8=8B=E5=90=8E=EF=BC=8C=E7=82=B9=E5=87=BB=E5=8A=A0=E5=85=A5?=
 =?UTF-8?q?=E6=8C=89=E9=92=AE=E6=97=A0=E5=8F=8D=E5=BA=94=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/services/courses_service.rb       | 2 +-
 app/views/courses/join.js.erb         | 2 +-
 app/views/projects/_new_join.html.erb | 9 +--------
 3 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/app/services/courses_service.rb b/app/services/courses_service.rb
index 807a26232..8092bee88 100644
--- a/app/services/courses_service.rb
+++ b/app/services/courses_service.rb
@@ -327,7 +327,7 @@ class CoursesService
           end
         else
             if params[:course_password] == course.password
-                if params[:role] == "10"
+                if params[:role] == "10" || params[:role] == nil
                   members = []
                   members << Member.new(:role_ids => [10], :user_id => current_user.id)
                   course.members << members
diff --git a/app/views/courses/join.js.erb b/app/views/courses/join.js.erb
index 8e6f8ce20..721367549 100644
--- a/app/views/courses/join.js.erb
+++ b/app/views/courses/join.js.erb
@@ -4,7 +4,7 @@ $("#join_in_course_header").html("<%= escape_javascript(join_in_course_header(@c
 <% if @state %>
 <% if @state == 0 %>
 alert("加入成功");
-hidden_join_course_form();
+hideModal();
 $("#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 %>
diff --git a/app/views/projects/_new_join.html.erb b/app/views/projects/_new_join.html.erb
index c406ac2e6..c823f5ed0 100644
--- a/app/views/projects/_new_join.html.erb
+++ b/app/views/projects/_new_join.html.erb
@@ -18,13 +18,6 @@
 
   <script type="text/javascript">
       function clickCanel(){hideModal("#popbox02");}
-      function clickSure()
-      {
-          if ($('#new_join_course').submit())
-          {
-              hideModal("#popbox02");
-          }
-      }
   </script>
 </head>
 
@@ -40,7 +33,7 @@
         <label>请输入课程密码:</label>
         <%= text_field_tag 'course_password', nil, :style=>'width:300px;'%>
         <div class="ni_btn">
-          <a href="javascript:" class="tijiao" onclick="clickSure();" >
+          <a href="javascript:" class="tijiao" onclick="$('#new_join_course').submit();" >
             确&nbsp;&nbsp;定
           </a>
           <a href="javascript:" class="tijiao" onclick="clickCanel();">