合并develop

dev_sync_trustie
杨树明 5 years ago
parent e7dad06de2
commit 2192231a0a

@ -1436,7 +1436,7 @@ class PollsController < ApplicationController
if poll_un_anony
user_login = u_user.login
user_name = u_user.real_name.present? ? u_user.real_name : "--"
user_class = poll.course.user_group_name
user_class = poll.course.user_group_name(u_user.id)
user_student_id = u_user.student_id.present? ? u_user.student_id : "--"
user_school_name = u_user.school_name.present? ? u_user.school_name : "--"
user_cell += [user_login,user_name, user_class, u_user.mail, user_student_id, user_school_name]

Loading…
Cancel
Save