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

app/controllers/courses_controller.rb

@@ -1100,13 +1100,19 @@ class CoursesController < ApplicationController
   def export_member_act_score
     search = params[:search] ? "#{params[:search].strip}" : ""   #用户名或学生学号id搜索
     group_id = params[:group_id]  #分班的班级id
-    @all_members = student_act_score group_id, search
+    @all_members = @course.students
+    @all_members = @all_members.where(course_group_id: group_id) unless group_id.blank?
+    unless search.blank?
+      @all_members = @all_members.joins(user: [:user_extension]).where('concat(users.lastname, users.firstname) like ? or user_extensions.student_id like ?',"%#{search}%","%#{search}%")
+    end
+
     if @all_members.size == 0
       normal_status(-1,"课堂暂时没有学生")
     elsif params[:export].present? && params[:export]
       normal_status(0,"正在下载中")
     else
       set_export_cookies
+      @all_members = student_act_score group_id, search
       act_score_to_xlsx(@all_members)
       filename_ = "#{current_user.real_name}_#{@course.name}_活跃度_#{Time.now.strftime('%Y%m%d_%H%M%S')}"
       render xlsx: "#{format_sheet_name filename_.strip}",template: "courses/export_member_act_score.xlsx.axlsx",

app/controllers/shixuns_controller.rb

@@ -13,7 +13,7 @@ class ShixunsController < ApplicationController
 	before_action :shixun_access_allowed, except: [:index, :new, :create, :menus, :get_recommend_shixuns, :add_file,
 																								 :propaedeutics, :departments, :apply_shixun_mirror,
 																								 :get_mirror_script, :download_file]
-	before_action :find_repo_name, only: [:repository, :commits, :file_content, :update_file, :shixun_exec, :copy]
+	before_action :find_repo_name, only: [:repository, :commits, :file_content, :update_file, :shixun_exec, :copy, :add_file]
 
 	before_action :allowed, only:  [:update, :close, :update_propaedeutics, :settings, :publish,
 																  :shixun_members_added, :change_manager, :collaborators_delete,