Merge branch 'master' into 'master'

打开文件添加为空处理 See merge request !12
2017-10-17 09:18:38 +08:00 · 2017-10-17 09:18:38 +08:00 · 049957bf4a
parent 8453107d6c d3858bb30b
commit 049957bf4a
1 changed files with 1 additions and 1 deletions
--- a/app/controllers/shixuns_controller.rb
+++ b/app/controllers/shixuns_controller.rb
@ -135,7 +135,7 @@ class ShixunsController < ApplicationController
    @path = params[:path]
    @rev = params[:rev]
    file_content = g.files(@shixun.gpid, @path, @rev).content
-    @content = tran_base64_decode64(file_content)
+    @content = tran_base64_decode64(file_content) unless file_content.blank?

    respond_to do |format|
      format.js