|
|
|
@ -1318,7 +1318,7 @@ class PollsController < ApplicationController
|
|
|
|
|
poll_ques_titles = poll_questions.pluck(:question_title).map {|k| ActionController::Base.helpers.strip_tags(k) if k.present?}
|
|
|
|
|
poll_un_anony = poll.un_anonymous
|
|
|
|
|
if poll_un_anony #是否匿名,默认为false
|
|
|
|
|
user_info = %w(登陆名 真实姓名 邮箱 学号)
|
|
|
|
|
user_info = %w(登陆名 真实姓名 邮箱 学号 学员单位)
|
|
|
|
|
else
|
|
|
|
|
user_info = []
|
|
|
|
|
end
|
|
|
|
@ -1392,7 +1392,8 @@ class PollsController < ApplicationController
|
|
|
|
|
user_login = u_user.login
|
|
|
|
|
user_name = u_user.real_name.present? ? u_user.real_name : "--"
|
|
|
|
|
user_student_id = u_user.student_id.present? ? u_user.student_id : "--"
|
|
|
|
|
user_cell += [user_login,user_name, u_user.mail, user_student_id]
|
|
|
|
|
user_school_name = u_user.school_name.present? ? u_user.school_name : "--"
|
|
|
|
|
user_cell += [user_login,user_name, u_user.mail, user_student_id, user_school_name]
|
|
|
|
|
end
|
|
|
|
|
all_user_cell = user_cell + user_answer_array
|
|
|
|
|
user_commit.push(all_user_cell)
|
|
|
|
|