nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Move photo upload logic to file_handler.

Browse source
This commit is contained in:
John Edmonds 2011-09-29 21:49:58 -04:00
parent dcd7e936df
commit 8d0f6699ae
1 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
app/controllers/photos_controller.rb
View file

@ -49,11 +49,7 @@ class PhotosController < ApplicationController
params[:photo][:aspect_ids] = params[:photo][:aspect_ids].values params[:photo][:aspect_ids] = params[:photo][:aspect_ids].values
end end
params[:photo][:user_file] = if request.params.has_key?(:qqfile) and not request.params[:qqfile].is_a?(String) params[:photo][:user_file] = file_handler(params)
params[:qqfile]
else
file_handler(params)
end
@photo = current_user.build_post(:photo, params[:photo]) @photo = current_user.build_post(:photo, params[:photo])
@ -213,6 +209,11 @@ class PhotosController < ApplicationController
private private
def file_handler(params) def file_handler(params)
# For XHR file uploads, request.params[:qqfile] will be the path to the temporary file
# For regular form uploads (such as those made by Opera), request.params[:qqfile] will be an UploadedFile which can be returned unaltered.
if not request.params[:qqfile].is_a?(String)
params[:qqfile]
else
######################## dealing with local files ############# ######################## dealing with local files #############
# get file name # get file name
file_name = params[:qqfile] file_name = params[:qqfile]
@ -234,5 +235,6 @@ class PhotosController < ApplicationController
Tempfile.send(:define_method, "content_type") {return att_content_type} Tempfile.send(:define_method, "content_type") {return att_content_type}
Tempfile.send(:define_method, "original_filename") {return file_name} Tempfile.send(:define_method, "original_filename") {return file_name}
file file
end
end end
end end