Merge branch 'Homework' into develop

app/controllers/zipdown_controller.rb

@@ -32,7 +32,7 @@ class ZipdownController < ApplicationController
     send_file zipfile, :filename => obj.name+".zip", :type => detect_content_type(zipfile) if zipfile
 
   rescue Exception => e
-    render file: 'public/no_file_found.html' , :layout => 'course_base'
+    render file: 'public/no_file_found.html'
   end
 
   #下载某一学生的作业的所有文件

app/views/homework_attach/_homework.html.erb

@@ -35,7 +35,7 @@
 <li class="wscore">
   <%= is_student_batch_homework ? l(:label_my_score) : l(:label_student_score)%>:
   <span class="c_red">
-    <%= is_student_batch_homework ? (homework.m_score.nil? ? l(:label_without_score) : homework.m_score) : (homework.s_score.nil? ? l(:label_without_score) : homework.s_score)%>
+    <%= is_student_batch_homework ? (homework.m_score.nil? ? l(:label_without_score) : format("%.2f",homework.m_score)) : (homework.s_score.nil? ? l(:label_without_score) : format("%.2f",homework.s_score))%>
   </span>
 </li>
 <% if is_teacher %>

plugins/redmine_code_review/app/views/code_review/_body_bottom.html.erb

@@ -20,7 +20,7 @@
 <%
 is_target = false
 
-if project and controller and project.module_enabled?(:code_review)
+if project and project.is_a?(Project) and controller and project.module_enabled?(:code_review)
   is_target = true
   is_target = false unless User.current.allowed_to?({:controller => 'code_review', :action => 'update_diff_view'}, project)
   setting = CodeReviewProjectSetting.find(:first, :conditions => ['project_id = ?', project.id])

plugins/redmine_code_review/app/views/code_review/_html_header.html.erb

@@ -16,7 +16,7 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 -%>
-<% if @project and @project.module_enabled?('code_review') %>
+<% if @project and @project.is_a?(Project) and @project.module_enabled?('code_review') %>
   <%
   baseurl = Redmine::Utils.relative_url_root