Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun

dev_forum
杨树明 5 years ago
commit 942b0ba1a3

@ -911,7 +911,7 @@ class PollsController < ApplicationController
end end
error_question = error_question.reject(&:blank?) error_question = error_question.reject(&:blank?)
if error_question.reject(&:blank?).length > 0 if error_question.reject(&:blank?).length > 0
normal_status(-1, "#{error_question.join("\n")}") normal_status(-1, word_wrap("#{error_question.join("\n")}"))
else else
poll_user_current = @poll.poll_users.find_by_group_ids(current_user.id).first poll_user_current = @poll.poll_users.find_by_group_ids(current_user.id).first
poll_user_params = { poll_user_params = {

@ -113,7 +113,7 @@
text-align: left; text-align: left;
} }
.percentForm{ .percentForm{
width: 340px; width: 330px;
height: 11px; height: 11px;
background: #F5F5F5; background: #F5F5F5;
border-radius: 6px; border-radius: 6px;

Loading…
Cancel
Save