From 79893c4917548bb0b1f3dc09a888fa00479e2033 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Fri, 5 Jun 2015 16:57:09 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BD=9C=E4=B8=9A=E6=8F=90=E4=BA=A4?=
 =?UTF-8?q?=E6=97=B6=EF=BC=8C=E6=A0=B9=E6=8D=AE=E9=AA=8C=E8=AF=81=E7=BB=93?=
 =?UTF-8?q?=E6=9E=9C=E7=9B=B8=E5=BA=94=E7=A9=BA=E9=97=B4focus?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/javascripts/course.js | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/public/javascripts/course.js b/public/javascripts/course.js
index b629530f0..4c0cae670 100644
--- a/public/javascripts/course.js
+++ b/public/javascripts/course.js
@@ -470,7 +470,15 @@ $(function(){
 //老师提交 新建/修改 作业
 function submit_homework(id)
 {
-    if(regex_homework_name()&&regex_evaluation_num())
+    if(!regex_homework_name())
+    {
+        $("#homework_name").focus();
+    }
+    else if(!regex_evaluation_num())
+    {
+        $("#evaluation_num").focus();
+    }
+    else
     {
         homework_description_editor.sync();
         $("#"+id).submit();

From 1a3a23b0ed3928c77aa67292d7a84280a390b54f Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Sat, 6 Jun 2015 09:44:37 +0800
Subject: [PATCH 2/2] =?UTF-8?q?BId=E5=B7=B2=E5=8F=96=E6=B6=88=E7=95=99?=
 =?UTF-8?q?=E8=A8=80=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/models/mailer.rb | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/app/models/mailer.rb b/app/models/mailer.rb
index 1325ef613..ec46917d9 100644
--- a/app/models/mailer.rb
+++ b/app/models/mailer.rb
@@ -199,8 +199,8 @@ class Mailer < ActionMailer::Base
     @title = "#@user #{t(:label_leave_your_message, :locale => 'zh')}"
     @issue_author_url = url_for(user_activities_url(@user))
     @url = case journals_for_message.jour.class.to_s.to_sym # 判断留言的对象所属类型
-             when :Bid
-               course_for_bid_url(journals_for_message.jour, anchor: "word_li_#{journals_for_message.id}")
+             # when :Bid
+             #   course_for_bid_url(journals_for_message.jour, anchor: "word_li_#{journals_for_message.id}")
              when :Project
                return -1 if journals_for_message.jour.project_type == Project::ProjectType_project
                project_feedback_url(journals_for_message.jour, anchor: "word_li_#{journals_for_message.id}")
@@ -236,12 +236,12 @@ class Mailer < ActionMailer::Base
       mail :to => @recipients,
            :subject => "#{l(:label_your_course)}#{journals_for_message.jour.name}#{l(:label_have_message)} ",
            :filter => true
-    elsif journals_for_message.jour.class.to_s.to_sym == :Bid
-      if !journals_for_message.jour.author.notify_about? journals_for_message
-        return -1
-      end
-
-      mail :to => recipients, :subject => @title,:filter => true
+    # elsif journals_for_message.jour.class.to_s.to_sym == :Bid
+    #   if !journals_for_message.jour.author.notify_about? journals_for_message
+    #     return -1
+    #   end
+    #
+    #   mail :to => recipients, :subject => @title,:filter => true
     elsif journals_for_message.jour.class.to_s.to_sym == :Contest
       if !journals_for_message.jour.author.notify_about? journals_for_message
         return -1