From ec726ed62ae82b95d2ab7e75140efaff914ac641 Mon Sep 17 00:00:00 2001 From: Christoph Haas Date: Sat, 18 Apr 2015 21:39:12 +0200 Subject: [PATCH] Merge --- app/controllers/packages_controller.rb | 4 ++-- app/views/packages/details.slim | 11 ++++++++--- app/views/packages/upload.slim | 4 ++-- 3 files changed, 12 insertions(+), 7 deletions(-) diff --git a/app/controllers/packages_controller.rb b/app/controllers/packages_controller.rb index 98c5c00..63d6051 100644 --- a/app/controllers/packages_controller.rb +++ b/app/controllers/packages_controller.rb @@ -61,13 +61,13 @@ 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 end diff --git a/app/views/packages/details.slim b/app/views/packages/details.slim index a9da7a2..6c57d41 100644 --- a/app/views/packages/details.slim +++ b/app/views/packages/details.slim @@ -18,12 +18,17 @@ 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 - //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' 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|