From 3122a3d0c2473f9f7100db858ad8a0441b1ec6c5 Mon Sep 17 00:00:00 2001 From: Christoph Haas Date: Wed, 11 Feb 2015 20:41:03 +0100 Subject: [PATCH 1/4] Comment out traces of jQuery.fileupload --- app/views/packages/upload.slim | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/packages/upload.slim b/app/views/packages/upload.slim index 53a0e42..28cfa99 100644 --- a/app/views/packages/upload.slim +++ b/app/views/packages/upload.slim @@ -17,8 +17,8 @@ = 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 + //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 - @package.screenshots.each do |screenshot| From 5c2a4f237edcbdf8be2f3b36e7d44772b859c1fd Mon Sep 17 00:00:00 2001 From: Christoph Haas Date: Wed, 11 Feb 2015 20:41:24 +0100 Subject: [PATCH 2/4] Make seperate upload page obsolete --- app/controllers/packages_controller.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/controllers/packages_controller.rb b/app/controllers/packages_controller.rb index d9b0988..40f3f0a 100644 --- a/app/controllers/packages_controller.rb +++ b/app/controllers/packages_controller.rb @@ -71,14 +71,14 @@ class PackagesController < ApplicationController #new_screenshot.image = params[:image] #render text: "File has been uploaded successfully" - redirect_to upload_package_by_name_path + redirect_to package_path end def delete_screenshot @screenshot = Screenshot.find_by(id: params[:id]) @screenshot.destroy - redirect_to upload_package_by_name_path + redirect_to package_path end private From eec71890a5cca600d95b2a705980334665bad0dd Mon Sep 17 00:00:00 2001 From: Christoph Haas Date: Wed, 11 Feb 2015 20:42:39 +0100 Subject: [PATCH 3/4] Added button to delete screenshot from package details page --- app/views/packages/details.slim | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/app/views/packages/details.slim b/app/views/packages/details.slim index cb0bf09..5c7535b 100644 --- a/app/views/packages/details.slim +++ b/app/views/packages/details.slim @@ -18,6 +18,11 @@ 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 + // TODO: Enable button only if admin or uploader + a.button.tiny.alert[ + href=delete_screenshot_path(@package.name, screenshot.id) + onclick="return confirm('Really delete the screenshot?');" + ] Delete screenshot // Upload image li From 09d8fc2a546f893fa1fbe1a629ad63dda15670fe Mon Sep 17 00:00:00 2001 From: Christoph Haas Date: Wed, 11 Feb 2015 20:42:56 +0100 Subject: [PATCH 4/4] Fixed file upload form in details page --- app/views/packages/details.slim | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/app/views/packages/details.slim b/app/views/packages/details.slim index 5c7535b..07f7724 100644 --- a/app/views/packages/details.slim +++ b/app/views/packages/details.slim @@ -26,14 +26,10 @@ // Upload image li - //a.button.radius.expand href=upload_package_by_name_path(name: @package.name) Upload a new screenshot - //= form_for @package, :url => upload_image_path, :html => { :multipart => true } do |form| - //= form.file_field :image + = form_tag(upload_image_path, multipart: true) + = file_field_tag('image') + = submit_tag - = form_for :screenshot, url: upload_image_path, html: { multipart: true } do |f| - = f.label :image, 'Upload new screenshot' - = f.file_field :image, id: 'fileupload', multiple: true - = f.submit 'Save' //- raise