From 60a183576c41fab272205b449151b25a773ce25e Mon Sep 17 00:00:00 2001 From: Christoph Haas Date: Tue, 10 Feb 2015 16:54:06 +0100 Subject: [PATCH] Uploading screenshots really works finally. :) --- app/controllers/packages_controller.rb | 3 +-- app/views/packages/upload.slim | 16 ++++++++-------- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/app/controllers/packages_controller.rb b/app/controllers/packages_controller.rb index 6095bf7..a951182 100644 --- a/app/controllers/packages_controller.rb +++ b/app/controllers/packages_controller.rb @@ -58,7 +58,7 @@ class PackagesController < ApplicationController # TODO raise "name not given" unless params[:name] @package = Package.find_by(name: params[:name]) - @new_screenshot = @package.screenshots.new + #@new_screenshot = @package.screenshots.new end def upload_image @@ -66,7 +66,6 @@ class PackagesController < ApplicationController #render text: params.to_json @package = Package.find_by(name: params[:name]) @new_screenshot = @package.screenshots.create(image: params[:image]) - @new_screenshot.save #raise #@package.save #new_screenshot.image = params[:image] diff --git a/app/views/packages/upload.slim b/app/views/packages/upload.slim index eb6f4f3..e7752b3 100644 --- a/app/views/packages/upload.slim +++ b/app/views/packages/upload.slim @@ -21,15 +21,15 @@ ' Click or drag a PNG screenshot file here .small-6.columns ' Form - - for screenshot in @package.screenshots - .row - img src=screenshot.url('large') - - - 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) + .row + h1 =screenshot.package.name + img src=screenshot.image.url(:large, timestamp: false, alt: screenshot.caption) + +// - @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