chaas/debshots
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Merge branch 'master' of git.workaround.org:chaas/debshots

Browse source
This commit is contained in:
Christoph Haas 2016-11-03 13:23:15 +01:00
parent 396f3a7751
commit 2189f8cc81
4 changed files with 9 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/controllers/packages_controller.rb
View file

@ -35,7 +35,7 @@ class PackagesController < ApplicationController
# Save the images already if they are valid.
# params[:screenshot][:image].each do |img|
successful_upload_count = 0
# successful_upload_count = 0
params[:file].each do |img|
new_screenshot = @package.screenshots.new(image: img)

17
app/views/packages/upload.slim
View file

@ -8,7 +8,7 @@
' You are about to upload a screenshot for the #{@package.name}
' package. Thanks for your contribution.
= form_tag(upload_image_path, multipart: true)
= form_for :screenshot, url: upload_image_path, html: { multipart: true, id: 'file-form' } do |f|
.row
.small-6.columns
@ -33,21 +33,6 @@
a.black.fancybox href=ss.image.url(:large, timestamp: false) rel='fancybox-thumb' title=ss.caption
= image_tag(ss.image.url(:thumb, timestamp: false), alt: ss.caption, class: 'thumbnail')
// <<<<<<< HEAD
= form_for :screenshot, url: upload_image_path, html: { multipart: true, id: 'file-form' } do |f|
/ = form_tag(upload_image_path, multipart: true, id: 'file-form')
.row
.small-6.columns
/ input.hidden-inputfile type="file" name="image" id="file" multiple=true
= f.file_field :image, id: 'file', multiple: true, class: 'hidden-inputfile'
label for="file"
a.button id="file-select-button"
= fa_stacked_icon "image", base: "circle-thin"
span id="file-label"
' Select screenshot files
// =======
// = render partial: 'packages/grid_thumbnail', locals: { pkg: pkg }
//- else