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:
commit
268016bf8d
|
@ -368,6 +368,7 @@ class Admin::GalleriesController < OrbitAdminController
|
||||||
end
|
end
|
||||||
def start_upload_process
|
def start_upload_process
|
||||||
@@upload_success = true
|
@@upload_success = true
|
||||||
|
sleep 0.01
|
||||||
render :json => {}.to_json
|
render :json => {}.to_json
|
||||||
end
|
end
|
||||||
def init_upload
|
def init_upload
|
||||||
|
@ -380,6 +381,7 @@ class Admin::GalleriesController < OrbitAdminController
|
||||||
render :json => {}.to_json
|
render :json => {}.to_json
|
||||||
end
|
end
|
||||||
def upload_image
|
def upload_image
|
||||||
|
sleep 0.01
|
||||||
if !(@@image_unprocessed.nil?)
|
if !(@@image_unprocessed.nil?)
|
||||||
album = Album.find(params[:album_id])
|
album = Album.find(params[:album_id])
|
||||||
files = params['files']
|
files = params['files']
|
||||||
|
|
Loading…
Reference in New Issue