From 7451cca9cf78ea233219c8d50ada3c0495808678 Mon Sep 17 00:00:00 2001 From: Christoph Haas Date: Tue, 10 Feb 2015 01:20:28 +0100 Subject: [PATCH] Uploading screenshots works --- app/controllers/packages_controller.rb | 16 +++++++++-- app/views/packages/upload.slim | 39 +++++++++++++++----------- 2 files changed, 35 insertions(+), 20 deletions(-) diff --git a/app/controllers/packages_controller.rb b/app/controllers/packages_controller.rb index c7ea6d4..6095bf7 100644 --- a/app/controllers/packages_controller.rb +++ b/app/controllers/packages_controller.rb @@ -58,16 +58,26 @@ class PackagesController < ApplicationController # TODO raise "name not given" unless params[:name] @package = Package.find_by(name: params[:name]) + @new_screenshot = @package.screenshots.new end def upload_image #render text: params[:image].to_json #render text: params.to_json @package = Package.find_by(name: params[:name]) - new_screenshot = @package.screenshots.create(params[:screenshot]) - @packages.save + @new_screenshot = @package.screenshots.create(image: params[:image]) + @new_screenshot.save + #raise + #@package.save #new_screenshot.image = params[:image] - render text: "File has been uploaded successfully" + #render text: "File has been uploaded successfully" + redirect_to upload_package_by_name_path end + + private + + #def user_params + # params.require(:screenshot).permit(:image) + #end end diff --git a/app/views/packages/upload.slim b/app/views/packages/upload.slim index 5a3ddf7..7588442 100644 --- a/app/views/packages/upload.slim +++ b/app/views/packages/upload.slim @@ -10,23 +10,28 @@ .small-6.columns //input id="fileupload" type="file" name="files[]" data-url=upload_image_path(name: @package.name) multiple=true - = form_for @package, :url => upload_image_path, :html => { :multipart => true } do |form| - = form.file_field :image + //= form_for @new_screenshot, :url => upload_image_path, :html => { :multipart => true } do |form| + // = form.file_field :image + // = form.submit 'Save' + = form_tag(upload_image_path, multipart: true) + = file_field_tag('image') + = submit_tag a.button.radius.expand href=upload_package_by_name_path(name: @package.name) ' Click or drag a PNG screenshot file here .small-6.columns ' Form + - puts @package.screenshots - @package.screenshots.each do |screenshot| .listview a.black.fancybox href=screenshot.image.url(:large, timestamp: false) rel='fancybox-thumb' title=screenshot.caption = image_tag(screenshot.image.url(:large, timestamp: false), alt: screenshot.caption) - .imgcaption - => screenshot.caption - - if screenshot.uploader - | (Uploaded by - =< screenshot.uploader - | ) +// .imgcaption +// => screenshot.caption +// - if screenshot.uploader +// | (Uploaded by +// =< screenshot.uploader +// | ) .small-12.medium-5.large-4.columns .bigpanel @@ -65,12 +70,12 @@ // .imgcaption =screenshot.caption // -javascript: - $('#fileupload').fileupload({ - dataType: 'json', - done: function (e, data) { - $.each(data.result.files, function (index, file) { - $('

').text(file.name).appendTo(document.body); - }); - } - }); +//javascript: +// $('#fileupload').fileupload({ +// dataType: 'json', +// done: function (e, data) { +// $.each(data.result.files, function (index, file) { +// $('

').text(file.name).appendTo(document.body); +// }); +// } +// });