Merge branch 'dev_aliyun' into dev_cxt

app/controllers/student_works_controller.rb

@@ -541,7 +541,7 @@ class StudentWorksController < ApplicationController
   def destroy_score
     score = @work.student_works_scores.find_by(id: params[:score_id])
     tip_exception("该评阅记录不存在") unless score.present?
-    tip_exception("该评阅记录不能删除") unless score.allow_delete(@current_user, @user_course_identity)
+    tip_exception("该评阅记录不能删除") unless score.allow_delete(current_user, @user_course_identity)
     begin
       score.destroy
       normal_status(0,"删除成功")

public/react/src/modules/courses/poll/PollNew.js

@@ -2774,8 +2774,13 @@ class PollNew extends Component {
 										className="color-grey-9 fl">{item.question.question_type === 1 ? "(单选题)" : item.question.question_type === 2 ? "(多选题)" : "(主观题)"}</span>
 									<span
 										className="selectAnswer ml10">{item.question.is_necessary === 1 ? "必答" : item.question.question_type === 2 ? "选答" : "选答"}</span>
-									<span style={{color: "#4B4B4B"}}
+									{
-												className="font-16 mt10 ml10">{(item.question.min_choices === undefined && item.question.max_choices === undefined ? "不限制" : item.question.min_choices === null && item.question.max_choices === null ? "不限制" : item.question.min_choices === 0 && item.question.max_choices === 0 ? "": item.question.min_choices === "null" && item.question.max_choices === "null" ? "不限制"  : "可选" +(item.question.min_choices===undefined||item.question.min_choices===null||item.question.min_choices===""||item.question.min_choices==="null"?2:item.question.min_choices) + "-" + (item.question.max_choices===undefined||item.question.max_choices===null||item.question.max_choices===""||item.question.max_choices==="null"?item.question.answers.length:item.question.max_choices) + "项")}</span>
+										item.question.question_type === 2?
+											<span style={{color: "#4B4B4B"}}
+														className="font-16 mt10 ml10">{(item.question.min_choices === undefined && item.question.max_choices === undefined ? "不限制" : item.question.min_choices === null && item.question.max_choices === null ? "不限制" : item.question.min_choices === 0 && item.question.max_choices === 0 ? "": item.question.min_choices === "null" && item.question.max_choices === "null" ? "不限制"  : "可选" +(item.question.min_choices===undefined||item.question.min_choices===null||item.question.min_choices===""||item.question.min_choices==="null"?2:item.question.min_choices) + "-" + (item.question.max_choices===undefined||item.question.max_choices===null||item.question.max_choices===""||item.question.max_choices==="null"?item.question.answers.length:item.question.max_choices) + "项")}</span>
+											: ""
+									}
+
 									{
 										polls_status === undefined || polls_status === 1 ?
 											<span className="fr">