Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh

ReadMe.txt

@@ -57,15 +57,9 @@ bundle exec rake db:migrate:up VERSION=20140410021724
 2.运行 bundle install --without development test
 3.运行 rake redmine:plugins:migrate RAILS_ENV=production
 4.启动服务器
-5.把文本格式 (Administration > Settings > General > Text formatting)改为CKEditor
-6.配置CKEditor插件(Administration > Plugins > Configure)
-
-某些情况数据库未插入插件配置值解决方案：
-1 复制plugins
-2 启动rails
-3 运行migrate
-3 打开admin配置插件（http://127.0.0.1:3000/settings/plugin/redmine_ckeditor）
-4 点击“查询”(就是确定的功能)
+5.配置CKEditor插件(Administration > Plugins > Configure)
+6.把文本格式 (Administration > Settings > General > Text formatting)改为CKEditor
+注意：一定要先配置CKEditor插件再见文本格式更改，不然，数据库不会生成对应记录，会报错。。
 ===============================================================================
 0719：若遇到首页定制报错问题请尝试如下操作
 如果运行迁移文件有报错与‘sort_type’相关 先运行 bundle exec rake db:migrate:down version=20140716021202 bundle exec rake db:migrate:up version=20140716021202

app/controllers/zipdown_controller.rb

@@ -41,7 +41,7 @@ class ZipdownController < ApplicationController
       if homework != nil
         if homework.attachments.count > 0
           zipfile = zip_homework_by_user homework
-          send_file zipfile, :filename => homework.name+".zip", :type => detect_content_type(zipfile) if zipfile
+          send_file zipfile, :filename => homework.name+".zip", :type => detect_content_type(zipfile) if(zipfile)
         else
           render_403 :message => :no_file_dowmload
         end
@@ -51,6 +51,8 @@ class ZipdownController < ApplicationController
     else
       render_403 :message => :notice_not_authorized
     end
+  rescue => e
+    render file: 'public/file_not_found.html'
   end
 
   private