From ba08f9adb137c39858166dd75ac16dbbb19c2984 Mon Sep 17 00:00:00 2001
From: cxt <853663049@qq.com>
Date: Thu, 20 Jun 2019 17:22:14 +0800
Subject: [PATCH] =?UTF-8?q?=E6=AF=95=E8=AE=BE=E4=BB=BB=E5=8A=A1=E4=BD=9C?=
=?UTF-8?q?=E5=93=81=E5=88=97=E8=A1=A8=E7=9A=84=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/controllers/courses_controller.rb | 2 +-
app/models/graduation_work.rb | 2 +-
app/views/graduation_tasks/tasks_list.json.jbuilder | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/app/controllers/courses_controller.rb b/app/controllers/courses_controller.rb
index df23b6b25..66682e30f 100644
--- a/app/controllers/courses_controller.rb
+++ b/app/controllers/courses_controller.rb
@@ -27,7 +27,7 @@ class CoursesController < ApplicationController
before_action :teacher_allowed, only: [:update, :destroy, :settings, :search_teacher_candidate,
:transfer_to_course_group, :delete_from_course,
:search_users, :add_students_by_search, :get_historical_courses, :add_teacher_popup, :add_teacher]
- before_action :admin_allowed, only: [:set_invite_code_halt, :set_public_or_private,
+ before_action :admin_allowed, only: [:set_invite_code_halt, :set_public_or_private, :join_graduation_group,
:set_course_group, :change_course_admin, :change_course_teacher,
:delete_course_teacher, :teacher_application_review, :create_group_by_importing_file]
before_action :teacher_or_admin_allowed, only: [:graduation_group_list, :create_graduation_group, :join_graduation_group,
diff --git a/app/models/graduation_work.rb b/app/models/graduation_work.rb
index 11255ce4e..a99a18b2a 100644
--- a/app/models/graduation_work.rb
+++ b/app/models/graduation_work.rb
@@ -53,7 +53,7 @@ class GraduationWork < ApplicationRecord
# 分班名
def class_grouping_name
- CourseMember.find_by(user_id: self.user_id, course_id: self.course_id).try(:course_group).try(:name) || '未分班'
+ CourseMember.find_by(user_id: self.user_id, course_id: self.course_id, role: 4).try(:course_group).try(:name) || '未分班'
end
# 分组名
diff --git a/app/views/graduation_tasks/tasks_list.json.jbuilder b/app/views/graduation_tasks/tasks_list.json.jbuilder
index c36526ceb..fe7ffddc4 100644
--- a/app/views/graduation_tasks/tasks_list.json.jbuilder
+++ b/app/views/graduation_tasks/tasks_list.json.jbuilder
@@ -32,7 +32,7 @@ if @task.published? || @user_course_identity < Course::STUDENT
json.array! @work_list do |work|
json.id work.id
json.user_id work.user.id
- json.name work.user.full_name
+ json.name work.user.real_name
json.student_id work.user.student_id
json.class_grouping_name work.class_grouping_name
if @task.have_grouping?