github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-05-21 18:12:32 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

remove useless upload topic direct association

Browse Source
This commit is contained in:
Régis Hanol
2013-06-15 09:54:49 +02:00
parent e603c85fa0
commit 6ea91b4416
6 changed files with 81 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
app/controllers/uploads_controller.rb
View File

@ -2,16 +2,15 @@ class UploadsController < ApplicationController
before_filter :ensure_logged_in
def create
params.require(:topic_id)
file = params[:file] || params[:files].first
# only supports images for now
return render status: 415, json: failed_json unless file.content_type =~ /^image\/.+/
upload = Upload.create_for(current_user.id, file, params[:topic_id])
upload = Upload.create_for(current_user.id, file)
render_serialized(upload, UploadSerializer, root: false)
rescue FastImage::ImageFetchFailure
render status: 422, text: I18n.t("upload.image.fetch_failure")
rescue FastImage::UnknownImageType