Merge branch 'master' into 'master'

Update galleries_controller.rb

solve the upload problem for production mode

See merge request !4
This commit is contained in:
wmcheng 2019-10-21 23:17:17 +08:00
commit 268016bf8d
1 changed files with 2 additions and 0 deletions

View File

@ -368,6 +368,7 @@ class Admin::GalleriesController < OrbitAdminController
end
def start_upload_process
@@upload_success = true
sleep 0.01
render :json => {}.to_json
end
def init_upload
@ -380,6 +381,7 @@ class Admin::GalleriesController < OrbitAdminController
render :json => {}.to_json
end
def upload_image
sleep 0.01
if !(@@image_unprocessed.nil?)
album = Album.find(params[:album_id])
files = params['files']