Merge branch 'educoder' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into educoder

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">

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>
@@ -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 %>

public/stylesheets/educoder/edu-all.css

@@ -3424,3 +3424,6 @@ line-height: 16px;display: inline-block;color: rgba(65, 140, 205, 1) !important;
 .width698{
     width: 698px;
 }
+.inlineblock{
+    display:inline-block;
+}