Merge branch 'develop' into szzh

app/helpers/application_helper.rb

@@ -2356,8 +2356,8 @@ module ApplicationHelper
       if work.nil?
         link_to "提交作品",  new_student_work_path(:homework => homework.id),:class => 'c_blue'
       else
-        if homework.homework_type == 1 && homework.homework_detail_manual && homework.homework_detail_manual.comment_status != 1 #匿评作业，且作业状态不是在开启匿评之前
-          link_to "作品已交",  "", :class => 'c_blue', :title => "开启匿评后不可修改作品"
+        if homework.homework_detail_manual && homework.homework_detail_manual.comment_status != 1 #匿评作业，且作业状态不是在开启匿评之前
+          link_to "作品已交",  "javascript:void(0)", :class => 'c_blue', :title => "开启匿评后不可修改作品"
         elsif homework.homework_type == 2 #编程作业不能修改作品
           link_to "修改作品",  new_student_work_path(:homework => homework.id),:class => 'c_blue'
         else

app/views/student_work/_evaluation_un_work.html.erb

@@ -3,7 +3,7 @@
   <li class="hworkList340 <%= @homework.homework_type == 2 ? '' : 'width385'%>">
     <ul>
       <li class="hworkPortrait mt15 mr10">
-        <%= link_to(image_tag(url_to_avatar(User.current),:width =>"40",:height => "40"),user_activities_path(User.current.id))%>
+        <%= link_to(image_tag(url_to_avatar(student_work.user),:width =>"40",:height => "40"),user_activities_path(User.current.id))%>
       </li>
       <div onclick="show_student_work('<%= student_work_path(student_work)%>');" style="cursor: pointer;">
         <li class="hworkName mt15 mr15 <%= @homework.homework_type == 2 ? '' : 'width165'%>">