From 2db3ab9d1385a01a310de5b408dcd8e321edc671 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Thu, 16 Apr 2015 10:56:48 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AF=BE=E7=A8=8B=E6=97=B6?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=AF=86=E7=A0=81=E4=B8=8E=E8=AF=BE=E6=97=B6?=
 =?UTF-8?q?=E7=9A=84=E9=AA=8C=E8=AF=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/services/courses_service.rb     | 2 +-
 app/views/courses/settings.html.erb | 3 ++-
 public/javascripts/course.js        | 6 +++---
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/app/services/courses_service.rb b/app/services/courses_service.rb
index 95bf5feba..6f207d76d 100644
--- a/app/services/courses_service.rb
+++ b/app/services/courses_service.rb
@@ -245,7 +245,7 @@ class CoursesService
     #course.safe_attributes = params[:course]
     course.time = params[:time]
     course.term = params[:term]
-    course.class_period = params[:class_period]
+    course.class_period = params[:class_period].to_i
     params[:course][:is_public] ? course.is_public = 1 : course.is_public = 0
     params[:course][:open_student] ? course.open_student = 1 : course.open_student = 0
     if course.save
diff --git a/app/views/courses/settings.html.erb b/app/views/courses/settings.html.erb
index acc6c12a5..2907ee0ac 100644
--- a/app/views/courses/settings.html.erb
+++ b/app/views/courses/settings.html.erb
@@ -39,8 +39,9 @@
           <div class="cl"></div>
           <li class="ml45 mb10">
             <label><span class="c_red">*</span>&nbsp;<%= l(:label_new_course_password)%>&nbsp;&nbsp;：</label>
-            <input  type="password" name="course[password]" id="course_course_password" class="hwork_input02" value="<%= @course.password%>">
+            <input  type="password" name="course[password]" id="course_course_password" class="hwork_input02" value="<%= @course.password%>" onkeyup="regex_course_password();">
             <a id="psw_btn" href="javascript:void(0)">显示明码</a>
+            <span class="c_red" id="course_course_password_notice"></span>
             <div class="cl"></div>
             <span class=" ml80 c_orange">学生或其他成员申请加入课程时候需要使用该口令，该口令可以由老师在课堂上公布。</span>
           </li>
diff --git a/public/javascripts/course.js b/public/javascripts/course.js
index 74ec4f362..8a16def1d 100644
--- a/public/javascripts/course.js
+++ b/public/javascripts/course.js
@@ -100,7 +100,7 @@ function regex_course_class_period()
         return false;
     }
 }
-
+//验证密码
 function regex_course_password()
 {
     var class_period = $.trim($("#course_course_password").val());
@@ -126,7 +126,7 @@ function regex_course_password()
 //提交新建课程
 function submit_new_course()
 {
-    if(regex_course_name()&&regex_course_class_period()&&regex_course_class_period()&&regex_course_password())
+    if(regex_course_name()&&regex_course_class_period()&&regex_course_password())
     {
         $("#new_course").submit();
     }
@@ -134,7 +134,7 @@ function submit_new_course()
 
 function submit_edit_course(id)
 {
-    if(regex_course_name()&&regex_course_class_period())
+    if(regex_course_name()&&regex_course_class_period()&&regex_course_password())
     {
         $("#edit_course_"+id).submit();
     }