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

app/helpers/application_helper.rb

@@ -6817,6 +6817,7 @@ end
 
 # 用户评测时更新实训作业成绩
 def update_myshixun_work_score myshixun
+  ActiveRecord::Base.transaction do
     student_works = myshixun.student_works
     #logger.info("#############student_works_count: #{student_works.count}")
     if student_works.count > 0
@@ -6883,6 +6884,7 @@ def update_myshixun_work_score myshixun
       end
     end
   end
+end
 
 # 用户开启实训时更新作品状态
 def update_myshixun_work_status myshixun

app/views/challenges/_challenges_left_nav.html.erb

@@ -1,8 +1,6 @@
 <div class="bor-bottom-greyE clearfix pl20 pr20 pt40 pb20 edu-back-white challengeNav">
   <a href="<%= shixun_challenges_url(@shixun) %>" class="<%= params[:action] == "index" ? "active" : "" %> fl mr40">任务</a>
-  <% if @shixun.propaedeutics.present? %>
-    <a href="<%= propaedeutics_shixun_path(@shixun) %>" class="<%= params[:action] == "propaedeutics" ? "active" : "" %> fl mr40">背景知识</a>
-  <% end %>
+ 
   <% if User.current.manager_of_shixun?(@shixun) %>
     <%= link_to l(:project_module_repository),
                   ({:controller => 'repositories',

app/views/subjects/_subject_members.html.erb

@@ -6,9 +6,12 @@
             <%= image_tag(url_to_avatar(member.user), :width =>"80", :height => "80", :class => "radius", :alt=>"头像") %>
           </a>
           <div class="fl ml15 flex1">
-            <p class="mb10 mt5"><%= member.user.try(:show_name) %></p>
-            <div class="clearfix">
-                <p class="color-grey-9 font-12 fl"><span class="mr10"><%= member.user.school_name %></span><span><%= member.user.identity == "学生" ? "" : member.user.identity %></span></p>
+            <p class="mb10 mt5"><%= member.user.try(:show_name) %> <span><%= member.user.identity == "学生" ? "" : member.user.identity %></span></p>
+            <div class="clearfix ml3">
+                <p class="color-grey-9 font-12 fl">
+<!--                  <span class="mr10"><%#= member.user.school_name %></span>-->
+
+                </p>
                 <!--<a href="JavaScript:void(0)" class="edu-default-btn edu-focus-btn fr color-grey-6">关注</a>-->
             </div>
           </div>