From 1535c4cd0703acc6514bdcc344f214fc96c1cfe1 Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Fri, 27 May 2016 15:54:55 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E7=BC=96=E8=BE=91=E5=88=86=E7=BB=84?=
 =?UTF-8?q?=E4=BD=9C=E4=B8=9A=E6=97=B6=E7=9A=84=E5=9F=BA=E4=BA=8E=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AE=E5=AE=9E=E6=96=BD=E6=80=BB=E6=98=AF=E9=BB=98=E8=AE=A4?=
 =?UTF-8?q?=E9=80=89=E4=B8=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/app/views/users/_user_group_attr.html.erb b/app/views/users/_user_group_attr.html.erb
index 48c303a29..681f158e7 100644
--- a/app/views/users/_user_group_attr.html.erb
+++ b/app/views/users/_user_group_attr.html.erb
@@ -10,7 +10,7 @@
 </div>
 <div class="mb10 mt10">
   <label>
-    <input type="checkbox" class="mr5" name="base_on_project" checked value="<%=(edit_mode && homework.is_group_homework?) ? homework.homework_detail_group.base_on_project : 1 %>" id="base_on_project"/>
+    <input type="checkbox" class="mr5" name="base_on_project" value="<%=(edit_mode && homework.is_group_homework?) ? homework.homework_detail_group.base_on_project : 1 %>" id="base_on_project"/>
     <span class="f14 fontGrey3 mr10">基于项目实施</span>
   </label>
   <p class="c_red">提醒：勾选后各小组必须在Trustie平台创建项目，教师可随时观察平台对各小组最新进展的实时统计。</p>

From 086ccedc08b9304f7497ac0c4756258ab8a37cf5 Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Fri, 27 May 2016 16:45:04 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=85=88=E9=9A=90=E8=97=8F=E4=BD=9C?=
 =?UTF-8?q?=E4=B8=9A=E4=BF=A1=E6=81=AF=EF=BC=8C=E5=86=8D=E7=82=B9=E5=87=BB?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=88=96=E5=88=86=E7=8F=AD=E5=90=8E=E2=80=9C?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E4=BD=9C=E4=B8=9A=E4=BF=A1=E6=81=AF=E2=80=9D?=
 =?UTF-8?q?=E7=9A=84=E6=8C=89=E9=92=AE=E4=B8=8D=E8=A7=81=E4=BA=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/student_work/_student_work_list.html.erb | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/app/views/student_work/_student_work_list.html.erb b/app/views/student_work/_student_work_list.html.erb
index bc7ab947f..eaf6b9304 100644
--- a/app/views/student_work/_student_work_list.html.erb
+++ b/app/views/student_work/_student_work_list.html.erb
@@ -39,6 +39,10 @@
 
 <script type="text/javascript">
   $(function(){
+      if($("#homework_info_hidden").is(":hidden"))
+      {
+          $("#homework_info_show").show();
+      }
       <% if !@is_evaluation && (!@is_teacher || params[:show_work_id].present?) || @message_student_work_id %>
           <% if @message_student_work_id %>
             <% work = @homework.student_works.where("id =?", @message_student_work_id).first %>