Merge branch 'develop' into szzh

app/views/layouts/_base_header.html.erb

@@ -34,7 +34,7 @@
 		</li>
 		<li style="padding:0 0; margin:0 0;display:inline;border-bottom: 0;">
 			<%=link_to l(:label_my_message)+'('+User.current.count_new_jour.to_s+')',
-                       {:controller=> 'users', :action => 'show', id: User.current.id, host: Setting.host_user},
+                       {:controller=> 'users', :action => 'user_newfeedback', id: User.current.id, host: Setting.host_user},
                        {:class => 'my-message'} if User.current.logged?%>
 		</li>
 	</ul>

app/views/student_work/index.html.erb

@@ -148,7 +148,7 @@
                       输出
                     </td>
                   </tr>
-                  <% homework.homework_tests.each do |test|%>
+                  <% @homework.homework_tests.each do |test|%>
                       <tr class="<%= cycle("", "b_grey") %>">
                         <td  class="td_tit">
                           <%=test.input%>