Merge remote-tracking branch 'origin/educoder' into educoder

app/controllers/student_work_controller.rb

@@ -508,7 +508,7 @@ class StudentWorkController < ApplicationController
     end
 
     @tab = params[:tab].nil? ? 1 : params[:tab].to_i
-    if User.current.member_of_course?(@homework.course) && params[:order].nil? && params[:sort].nil? && params[:name].nil? && params[:group].nil? && params[:page].nil?
+    if (User.current.member_of_course?(@homework.course) || User.current.admin?) && params[:order].nil? && params[:sort].nil? && params[:name].nil? && params[:group].nil? && params[:page].nil?
       if !@course.is_end && @homework.homework_type == 4 && @homework.homework_detail_manual.comment_status > 0 && (@homework.end_time > Time.now || (@homework.end_time <= Time.now && @homework.allow_late))
         update_shixun_work_status @homework
       end

db/migrate/20190314080805_create_shixun_student_works.rb

@@ -25,6 +25,8 @@ class CreateShixunStudentWorks < ActiveRecord::Migration
       begin
         ActiveRecord::Base.transaction do
           if shixun.present? && user.present?
+            myshixun = Myshixun.where(:user_id => user.id, :shixun_id => shixun.id).first
+            if myshixun.blank?
               # 创建新的myshixun和games
               # fork版本库，如果用户没有同步，则先同步用户
               g = Gitlab.client
@@ -69,6 +71,7 @@ class CreateShixunStudentWorks < ActiveRecord::Migration
                   Game.create!(:challenge_id => challenge.id, :myshixun_id => myshixun.id, :status => status, :user_id => myshixun.user_id,
                                :open_time => Time.now, :identifier => code, :modify_time => challenge.modify_time)
                 end
+              end
               work_score = work.final_score
               work.homework_common.homework_challenge_settings.each do |setting|
                 if work_score > 1
@@ -78,6 +81,8 @@ class CreateShixunStudentWorks < ActiveRecord::Migration
                 end
               end
               work.update_column("myshixun_id", myshixun.id)
+            else
+              work.update_attributes(:myshixun_id => 0)
             end
           end
         end