diff --git a/app/controllers/courses_controller.rb b/app/controllers/courses_controller.rb index 8812e69fe..baa8b0d85 100644 --- a/app/controllers/courses_controller.rb +++ b/app/controllers/courses_controller.rb @@ -742,12 +742,15 @@ class CoursesController < ApplicationController # 切换为教师 def switch_to_teacher begin - course_member = @course.course_members.find_by!(user_id: current_user.id, is_active: 1) - tip_exception("切换失败") unless course_member.STUDENT? + course_student = @course.students.find_by!(user_id: current_user.id, is_active: 1) + tip_exception("切换失败") unless course_student.present? course_teacher = CourseMember.find_by!(user_id: current_user.id, role: %i[CREATOR PROFESSOR], course_id: @course.id) - course_member.update!(is_active: 0) - course_teacher.update!(is_active: 1) + ActiveRecord::Base.transaction do + course_student.destroy! + course_teacher.update!(is_active: 1) + CourseDeleteStudentDeleteWorksJob.perform_later(@course.id, [current_user.id]) + end normal_status(0, "切换成功") rescue => e uid_logger_error(e.message) @@ -758,12 +761,15 @@ class CoursesController < ApplicationController # 切换为助教 def switch_to_assistant begin - course_member = @course.course_members.find_by!(user_id: current_user.id, is_active: 1) - tip_exception("切换失败") unless course_member.STUDENT? + course_student = @course.course_members.find_by!(user_id: current_user.id, is_active: 1) + tip_exception("切换失败") unless course_student.present? course_teacher = CourseMember.find_by!(user_id: current_user.id, role: %i[ASSISTANT_PROFESSOR], course_id: @course.id) - course_member.update!(is_active: 0) - course_teacher.update!(is_active: 1) + ActiveRecord::Base.transaction do + course_student.destroy! + course_teacher.update!(is_active: 1) + CourseDeleteStudentDeleteWorksJob.perform_later(@course.id, [current_user.id]) + end normal_status(0, "切换成功") rescue => e uid_logger_error(e.message) diff --git a/app/views/admins/item_authentications/shared/_list.html.erb b/app/views/admins/item_authentications/shared/_list.html.erb index 34e29d845..0c6b4cfa9 100644 --- a/app/views/admins/item_authentications/shared/_list.html.erb +++ b/app/views/admins/item_authentications/shared/_list.html.erb @@ -1,4 +1,9 @@ <% is_processed = params[:status].to_s != 'pending' %> + +
+ +<%= raw [user.school_name.presence, user.department_name.presence].compact.join(' ') %> |
<% if item.item_type == "PROGRAM" %> - <%= link_to item.name, "/problems/#{item.container&.identifier}/edit", class: "d-inline-block text-truncate", + <%= link_to item.name, "/problems/#{item.container&.identifier}/edit", id: "item_name_#{index}", class: "d-inline-block text-truncate", style: "max-width: 280px", target: "_blank", data: { toggle: 'tooltip', title: "#{item.name}"} %> <% else %> - <%= link_to item.name, admins_item_authentication_path(apply), remote: true, class: "d-inline-block text-truncate", + <%= link_to item.name, admins_item_authentication_path(apply), remote: true, id: "item_name_#{index}", class: "d-inline-block text-truncate", style: "max-width: 280px", data: { toggle: 'tooltip', title: "#{item.name}"} %> <% end %> | @@ -59,4 +64,18 @@