From a75b92e574a9728a4895a7c3e6bf566d163f7f59 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com>
Date: Wed, 3 Jul 2019 10:44:18 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=88=97=E8=A1=A8=E5=A4=9A=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E9=97=AE=E9=A2=98=E8=B0=83=E6=95=B4=EF=BC=8C=E9=82=80?=
 =?UTF-8?q?=E8=AF=B7=E7=A0=81=E6=96=87=E5=AD=97=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/courses/_join_private_course.html.erb            | 4 ++--
 app/views/student_work/_evaluation_un_group_title.html.erb | 4 ++--
 public/stylesheets/educoder/edu-all.css                    | 3 +++
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/app/views/courses/_join_private_course.html.erb b/app/views/courses/_join_private_course.html.erb
index f8876ae8..575ded92 100644
--- a/app/views/courses/_join_private_course.html.erb
+++ b/app/views/courses/_join_private_course.html.erb
@@ -8,9 +8,9 @@
           <ul>
             <li class="clearfix mb10">
               <label class="panel-form-label fl">课堂邀请码：</label>
-              <input type="text" class="input-60-40 fl" name="invite_code" placeholder="请输入五位课堂邀请码" value="<%= @invitation_code %>">
+              <input type="text" class="input-60-40 fl" name="invite_code" placeholder="请输入5位课堂邀请码或6位分班邀请码" style="width: 70%;" value="<%= @invitation_code %>">
             </li>
-            <p id="none_invite_code_notice" class="color-orange none f12" style="margin-left: 90px;">请输入五位课堂邀请码</p>
+            <p id="none_invite_code_notice" class="color-orange none f12" style="margin-left: 90px;">请输入5位课堂邀请码或6位分班邀请码</p>
             <li class="clearfix ">
               <label class="panel-form-label fl">身份：</label>
               <span class="fl mr20 mt2">
diff --git a/app/views/student_work/_evaluation_un_group_title.html.erb b/app/views/student_work/_evaluation_un_group_title.html.erb
index d782fe7f..f3ca6649 100644
--- a/app/views/student_work/_evaluation_un_group_title.html.erb
+++ b/app/views/student_work/_evaluation_un_group_title.html.erb
@@ -50,11 +50,11 @@
       <%= student_work.group_id == 0 ? '--' : '分组'+student_work.group_id.to_s %>
     </td>
     <% if @homework.homework_detail_group.base_on_project == 1 %>
-      <td class="student_score_info pr">
+      <td class="student_score_info pr inlineblock">
         <% if student_work.project %>
           <% project = student_work.project %>
           <% if project.status != 9 && (project.is_public || User.current.member_of?(project) || @is_teacher) %>
-            <%= link_to project.name, project_path(project.id), :class => 'color-grey3 task-hide', :style => "max-width:120px;", :title => "项目名称", :target => "_blank" %>
+            <%= link_to project.name, project_path(project.id), :class => 'color-grey3 task-hide inlineblock', :style => "max-width:120px;", :title => "项目名称", :target => "_blank" %>
           <% elsif project.status != 9 %>
             <span class="task-hide" style="display: block; max-width:120px;" title="该项目是私有的"><%= project.name %></span>
           <% else %>
diff --git a/public/stylesheets/educoder/edu-all.css b/public/stylesheets/educoder/edu-all.css
index 24d992c9..c550bac6 100644
--- a/public/stylesheets/educoder/edu-all.css
+++ b/public/stylesheets/educoder/edu-all.css
@@ -3423,4 +3423,7 @@ line-height: 16px;display: inline-block;color: rgba(65, 140, 205, 1) !important;
 }
 .width698{
     width: 698px;
+}
+.inlineblock{
+    display:inline-block;
 }
\ No newline at end of file

From b3fe83f61b17dc8aa394e3d71578c16bf2fb2966 Mon Sep 17 00:00:00 2001
From: cxt <853663049@qq.com>
Date: Wed, 3 Jul 2019 11:34:05 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/app/views/student_work/_evaluation_un_group_title.html.erb b/app/views/student_work/_evaluation_un_group_title.html.erb
index d782fe7f..45756245 100644
--- a/app/views/student_work/_evaluation_un_group_title.html.erb
+++ b/app/views/student_work/_evaluation_un_group_title.html.erb
@@ -36,7 +36,7 @@
       <a href="/users/<%= (student_work.user.try(:login)) %>" class="color-grey3"><%= student_work.user.show_real_name %></a>
     </td>
     <% group_id = @members.select{|m|m.user_id==student_work.user_id}.first.try(:course_group_id) %>
-    <% group_name = group_id.to_i == 0 ? '未分班' : @course.course_groups.find_by_id(group_id).name %>
+    <% group_name = group_id.to_i == 0 ? '未分班' : @course.course_groups.find_by_id(group_id).try(:name) %>
     <td title="<%= group_name %>">
       <span class="task-hide" style="display: block;max-width: 120px;"><%= group_name %></span>
     </td>