diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index ccf52049c..15e795bdb 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -330,7 +330,7 @@ class ApplicationController < ActionController::Base
end
if !User.current.logged? && Rails.env.development?
- User.current = User.find 8825
+ User.current = User.find 1
end
diff --git a/app/controllers/courses_controller.rb b/app/controllers/courses_controller.rb
index 48f644a14..46ac514b4 100644
--- a/app/controllers/courses_controller.rb
+++ b/app/controllers/courses_controller.rb
@@ -99,7 +99,7 @@ class CoursesController < ApplicationController
limit = params[:limit] || 16
@courses = @courses.page(page).per(limit)
- @courses = @courses.preload(:school, :none_hidden_course_modules, :teacher_users, teacher: :user_extension)
+ @courses = @courses.preload(:school, :none_hidden_course_modules, teacher: :user_extension)
end
def course_videos
diff --git a/app/controllers/myshixuns_controller.rb b/app/controllers/myshixuns_controller.rb
index a96a2a79f..8713bebf3 100644
--- a/app/controllers/myshixuns_controller.rb
+++ b/app/controllers/myshixuns_controller.rb
@@ -18,7 +18,8 @@ class MyshixunsController < ApplicationController
# 强制重置实训
# 前段需要按照操作过程提示
def reset_my_game
- unless (current_user.admin? || current_user.id == @myshixun.user_id)
+ course = Course.find_by(id: params[:course_id])
+ unless (current_user.admin_or_business? || current_user.id == @myshixun.user_id) || (course.present? && current_user.course_identity(course) < Course::STUDENT)
tip_exception("403", "")
end
begin
diff --git a/app/controllers/weapps/courses_controller.rb b/app/controllers/weapps/courses_controller.rb
index 2a375a7fb..3a1b22cc4 100644
--- a/app/controllers/weapps/courses_controller.rb
+++ b/app/controllers/weapps/courses_controller.rb
@@ -76,6 +76,7 @@ class Weapps::CoursesController < Weapps::BaseController
def show
@course = current_course
@current_user = current_user
+ @teacher_users = @course.teacher_users.where.not(id: @course.tea_id).map(&:real_name)[0..2]
end
def shixun_homework_category
diff --git a/app/controllers/weapps/homes_controller.rb b/app/controllers/weapps/homes_controller.rb
index e53923fa8..3e94354a2 100644
--- a/app/controllers/weapps/homes_controller.rb
+++ b/app/controllers/weapps/homes_controller.rb
@@ -19,7 +19,7 @@ class Weapps::HomesController < Weapps::BaseController
@courses = @courses.where(id: current_laboratory.all_courses)
@course_count = @courses.count
order_str = "course_members.sticky=1 desc, course_members.sticky_time desc, courses.created_at desc"
- @courses = paginate(@courses.order(order_str).includes(:teacher, :school))
+ @courses = paginate(@courses.order(order_str).includes(:teacher_users, :teacher, :school))
@user = current_user
end
end
\ No newline at end of file
diff --git a/app/views/courses/index.json.jbuilder b/app/views/courses/index.json.jbuilder
index a8b70c435..f9bceebb8 100644
--- a/app/views/courses/index.json.jbuilder
+++ b/app/views/courses/index.json.jbuilder
@@ -13,6 +13,5 @@ json.courses @courses do |course|
json.is_end course.is_end
json.first_category_url module_url(course.none_hidden_course_modules.first, course)
json.excellent course.excellent
- json.teacher_users course.teacher_users.select{|u| u.id != course.tea_id }.map(&:real_name)[0..2] # 取前3名老师
end
json.courses_count @courses_count
diff --git a/app/views/student_works/shixun_work_report.json.jbuilder b/app/views/student_works/shixun_work_report.json.jbuilder
index d8ab98a3f..c6596d1ee 100644
--- a/app/views/student_works/shixun_work_report.json.jbuilder
+++ b/app/views/student_works/shixun_work_report.json.jbuilder
@@ -1,4 +1,5 @@
json.homework_common_id @homework.id
+json.course_id @homework.course_id
json.category @homework.category_info
json.course_name @course.name
json.work_id @work.id
diff --git a/app/views/weapps/courses/show.json.jbuilder b/app/views/weapps/courses/show.json.jbuilder
index c22b24426..cf58315b4 100644
--- a/app/views/weapps/courses/show.json.jbuilder
+++ b/app/views/weapps/courses/show.json.jbuilder
@@ -1,4 +1,5 @@
json.(@course, :id, :name, :course_members_count, :credit, :invite_code_halt)
json.teachers_count @course.teachers.count
json.students_count @course.students.count
-json.course_identity @current_user.course_identity(@course)
\ No newline at end of file
+json.course_identity @current_user.course_identity(@course)
+json.teacher_users @teacher_users
\ No newline at end of file
diff --git a/app/views/weapps/homes/show.json.jbuilder b/app/views/weapps/homes/show.json.jbuilder
index f307d64fe..5d0e35e05 100644
--- a/app/views/weapps/homes/show.json.jbuilder
+++ b/app/views/weapps/homes/show.json.jbuilder
@@ -26,5 +26,6 @@ json.courses @courses.each do |course|
course_member = @category == "study" ? course.students.where(user_id: @user.id).first : course.teachers.where(user_id: @user.id).first
json.sticky course_member.sticky
json.course_identity current_user.course_identity(course)
+ json.teacher_users course.teacher_users.select{|u| u.id != course.tea_id }.map(&:real_name)[0..2] # 取前3名老师
end
diff --git a/public/react/src/modules/courses/busyWork/CommonWorkList.js b/public/react/src/modules/courses/busyWork/CommonWorkList.js
index 4c53a8362..e45d016bb 100644
--- a/public/react/src/modules/courses/busyWork/CommonWorkList.js
+++ b/public/react/src/modules/courses/busyWork/CommonWorkList.js
@@ -1,6 +1,6 @@
import React,{Component} from "react";
-import { Form, Select, Input, Button,Checkbox,Upload,Icon,message,Modal, Table, Divider, Tag,DatePicker,Radio,Tooltip,Spin, Pagination} from "antd";
-import {WordsBtn, ConditionToolTip, queryString, publicSearchs, on, off, NoneData, sortDirections} from 'educoder';
+import { Form, Table,Tooltip,Spin, Pagination} from "antd";
+import { queryString, publicSearchs, on, off, NoneData, sortDirections} from 'educoder';
import axios from 'axios';
import CheckAllGroup from '../common/button/CheckAllGroup'
import moment from 'moment';
@@ -11,7 +11,6 @@ import ModulationModal from "../coursesPublic/ModulationModal";
import AccessoryModal from "../coursesPublic/AccessoryModal";
import LeaderIcon from './common/LeaderIcon'
const $ = window.$;
-const Search = Input.Search;
function renderScore(score, content) {
let color = '#747A7F'
@@ -369,18 +368,24 @@ function buildColumns(that, student_works, studentData) {
{/* 0 未提交 */}
{/**/}
{/**/}
+
+
+
{/* toWorkDetailPage */}
{/* /classrooms/"+courseId+"/common_homeworks/"+workId+ '/' + record.id +"/appraise */}
- that.props.toWorkDetailPage2(e, courseId, workId, record.id)}
- // onClick={() => that.props.toWorkDetailPage(courseId, workId, record.id)}
- >{isAdmin ? record.has_comment===true?"已评阅":'评阅':"查看"}
-
),
diff --git a/public/react/src/modules/courses/shixunHomework/Chongzuomodel.js b/public/react/src/modules/courses/shixunHomework/Chongzuomodel.js
index e0bdc7378..edbd106c8 100644
--- a/public/react/src/modules/courses/shixunHomework/Chongzuomodel.js
+++ b/public/react/src/modules/courses/shixunHomework/Chongzuomodel.js
@@ -23,7 +23,7 @@ class Chongzuomodel extends React.Component {
this.setState({
antIcon:true
})
- let zrl=`/myshixuns/${this.props.chongzuoId}/reset_my_game.json`;
+ let zrl=`/myshixuns/${this.props.chongzuoId}/reset_my_game.json?course_id=${this.props.match.params.coursesId}`;
axios.get(zrl).then((response) => {
this.setState({
antIcon:false