diff --git a/app/controllers/homework_attach_controller.rb b/app/controllers/homework_attach_controller.rb index 564f60ac3..72755dc6a 100644 --- a/app/controllers/homework_attach_controller.rb +++ b/app/controllers/homework_attach_controller.rb @@ -427,7 +427,7 @@ class HomeworkAttachController < ApplicationController @homework = HomeworkAttach.find(params[:homework_id]) #保存评分 - @homework.rate(@m_score.to_i,User.current.id,:quality) if @m_score && @m_score != "0" + @homework.rate(@m_score.to_i,User.current.id,:quality) if @m_score #保存评论 @is_comprehensive_evaluation = @is_teacher ? 1 : (@is_anonymous_comments ? 2 : 3) #判断当前评论是老师评论?匿评?留言 if params[:new_form] && params[:new_form][:user_message] && params[:new_form][:user_message] != "" #有没有留言 diff --git a/app/views/homework_attach/_addjour.html.erb b/app/views/homework_attach/_addjour.html.erb index d07c713db..48beebdf8 100644 --- a/app/views/homework_attach/_addjour.html.erb +++ b/app/views/homework_attach/_addjour.html.erb @@ -21,7 +21,7 @@ function submit_jours(is_teacher) { - if($("#stars_value").val() == "0"){alert("您还没有打分");return;} + if(!is_teacher&&$("#stars_value").val() == "0"){alert("您还没有打分");return;} if(!is_teacher&&$("#new_form_user_message").val() == ""){alert("您还没有填写评语");return;} $('#new_form_user_message').parent().submit(); } diff --git a/app/views/homework_attach/_homework.html.erb b/app/views/homework_attach/_homework.html.erb index 802a021a4..c2b87832c 100644 --- a/app/views/homework_attach/_homework.html.erb +++ b/app/views/homework_attach/_homework.html.erb @@ -32,7 +32,7 @@ <% unless is_student_batch_homework %> <%= l(:label_teacher_score)%>: - <%= homework.t_score.nil? ? l(:label_without_score) : format("%.2f",homework.t_score)%> + <%= (homework.t_score.nil? || (homework.t_score && homework.t_score.to_i == 0)) ? l(:label_without_score) : format("%.2f",homework.t_score)%>    <% end %> diff --git a/app/views/homework_attach/_review.html.erb b/app/views/homework_attach/_review.html.erb index 6663bc6fe..b4508d225 100644 --- a/app/views/homework_attach/_review.html.erb +++ b/app/views/homework_attach/_review.html.erb @@ -26,12 +26,14 @@ <%= format_time(review.created_at) %> - - <%= l(:label_work_rating) %>: - -
- <%= render :partial => 'homework_attach/show_static_star', :locals => {:start_score => review.stars } %> -
+ <% if review.stars && review.stars.to_i > 0%> + + <%= l(:label_work_rating) %>: + +
+ <%= render :partial => 'homework_attach/show_static_star', :locals => {:start_score => review.stars } %> +
+ <% end %>

<%= textilizable jour.nil? ? "" : jour.notes%>