diff --git a/app/controllers/uploads_controller.rb b/app/controllers/uploads_controller.rb index 2030e6a54..a4df65274 100644 --- a/app/controllers/uploads_controller.rb +++ b/app/controllers/uploads_controller.rb @@ -44,7 +44,7 @@ class UploadsController < ApplicationController def preprocess @upload, @post, @source, @remote_size = UploadService::ControllerHelper.prepare( - url: params[:url], file: params[:file], ref: params[:ref] + url: upload_params[:source], file: upload_params[:file], ref: upload_params[:referer_url] ) render body: nil end diff --git a/app/javascript/src/javascripts/uploads.js b/app/javascript/src/javascripts/uploads.js index 4d398d897..84f0a7390 100644 --- a/app/javascript/src/javascripts/uploads.js +++ b/app/javascript/src/javascripts/uploads.js @@ -87,7 +87,7 @@ Upload.initialize_info_bookmarklet = function() { Upload.initialize_info_manual = function() { $("#fetch-data-manual").click(function(e) { var source = $("#upload_source,#post_source").val(); - var referer = $("#ref").val(); + var referer = $("#upload_referer_url").val(); if (/^https?:\/\//.test(source)) { $("#source-info span#loading-data").show(); diff --git a/app/views/uploads/new.html.erb b/app/views/uploads/new.html.erb index a1a2be0a3..144572a0f 100644 --- a/app/views/uploads/new.html.erb +++ b/app/views/uploads/new.html.erb @@ -18,9 +18,8 @@ <%= form_for(@upload, :html => {:multipart => true, :class => "simple_form", :id => "form"}) do |f| %> - <%= hidden_field_tag :url, params[:url] %> - <%= hidden_field_tag :ref, params[:ref] %> <%= f.hidden_field :md5_confirmation %> + <%= f.hidden_field :referer_url, value: params[:ref] %> <% if CurrentUser.can_upload_free? %>
@@ -160,7 +159,7 @@ } $("#filedropzone").dropzone({ - paramName: "file", + paramName: "upload[file]", url: "/uploads/preprocess", createImageThumbnails: false, addRemoveLinks: false,