Merge branch 'develop' into szzh

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] != ""  #有没有留言

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();
     }

app/views/homework_attach/_homework.html.erb

@@ -32,7 +32,7 @@
   <% unless is_student_batch_homework %>
       <%= l(:label_teacher_score)%>:
       <span class="c_red">
-        <%= 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)%>
       </span>
       &nbsp;&nbsp;
   <% end %>

app/views/homework_attach/_review.html.erb

@@ -26,12 +26,14 @@
                 <%= format_time(review.created_at) %>
               </span>
               <span style="font-weight:bold; color:#a6a6a6; float: right;">
-                <span style="float:left">
-                    <%= l(:label_work_rating) %>：
-                  </span>
-                  <div class="ping_star">
-                    <%= render :partial => 'homework_attach/show_static_star', :locals => {:start_score => review.stars }  %>
-                  </div>
+                <% if review.stars && review.stars.to_i > 0%>
+                    <span style="float:left">
+                      <%= l(:label_work_rating) %>：
+                    </span>
+                    <div class="ping_star">
+                      <%= render :partial => 'homework_attach/show_static_star', :locals => {:start_score => review.stars }  %>
+                    </div>
+                <% end %>
               </span>
               <div class="cl"></div>
               <p><%= textilizable jour.nil? ? "" : jour.notes%></p>