diff --git a/app/controllers/games_controller.rb b/app/controllers/games_controller.rb index ac0b6baa8..9e645c35a 100644 --- a/app/controllers/games_controller.rb +++ b/app/controllers/games_controller.rb @@ -51,9 +51,8 @@ class GamesController < ApplicationController # 统计评测时间 record_onsume_time = EvaluateRecord.where(game_id: @game.id).first.try(:consume_time) - # power判断用户是否有权限查看隐藏测试集(TPM管理员;平台认证的老师;花费金币查看者) - # myshixun_manager - myshixun_manager = current_user.manager_of_shixun?(@shixun) || (current_user.is_teacher? && current_user.pro_certification?) + # myshixun_manager判断用户是否有权限查看隐藏测试集(TPM管理员;平台认证的老师;花费金币查看者) + myshixun_manager = @identity < USER::EDU_GAME_MANAGER # 选择题和编程题公共部分 @base_date = {st: @st, discusses_count: discusses_count, game_count: game_count, myshixun: @myshixun, diff --git a/app/views/shixuns/add_collaborators.json.jbuilder b/app/views/shixuns/add_collaborators.json.jbuilder index d73a5b9bc..d20f0b318 100644 --- a/app/views/shixuns/add_collaborators.json.jbuilder +++ b/app/views/shixuns/add_collaborators.json.jbuilder @@ -4,7 +4,7 @@ json.users do json.array! @users do |user| json.user_id user.id json.identify user.identity - json.nickname user.lastname + json.nickname user.real_name json.school_name user.school_name end