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-07-14 17:43:27 +02:00
commit a01d2c751c
5 changed files with 21 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

10
app/controllers/packages_controller.rb
View file

@ -35,6 +35,7 @@ class PackagesController < ApplicationController
if new_screenshot.valid? if new_screenshot.valid?
new_screenshot.uploaderhash = session[:token] new_screenshot.uploaderhash = session[:token]
new_screenshot.uploaderip = session[:ip] new_screenshot.uploaderip = session[:ip]
new_screenshot.version = @package.version
new_screenshot.save new_screenshot.save
successful_upload_count += 1 successful_upload_count += 1
Log.log "Screenshot #{new_screenshot.id} uploaded successfully." Log.log "Screenshot #{new_screenshot.id} uploaded successfully."
@ -70,6 +71,7 @@ class PackagesController < ApplicationController
if new_screenshot.valid? if new_screenshot.valid?
# new_screenshot.uploaderhash = session[:token] # new_screenshot.uploaderhash = session[:token]
new_screenshot.uploaderip = session[:ip] new_screenshot.uploaderip = session[:ip]
new_screenshot.version = @package.version
new_screenshot.save new_screenshot.save
Log.log "Screenshot #{new_screenshot.id} uploaded successfully from legacy upload form." Log.log "Screenshot #{new_screenshot.id} uploaded successfully from legacy upload form."
redirect_to package_path(params[:packagename]) redirect_to package_path(params[:packagename])
@ -81,7 +83,7 @@ class PackagesController < ApplicationController
def delete_screenshot def delete_screenshot
# Is the user allowed to delete the screenshot? # Is the user allowed to delete the screenshot?
@screenshot = Screenshot.find!(params[:id]) @screenshot = Screenshot.find(params[:id])
if user_can_alter_screenshot? if user_can_alter_screenshot?
@screenshot.destroy @screenshot.destroy
@ -93,7 +95,7 @@ class PackagesController < ApplicationController
end end
def approve_screenshot def approve_screenshot
@screenshot = Screenshot.find!(params[:id]) @screenshot = Screenshot.find(params[:id])
@screenshot.approve_screenshot! @screenshot.approve_screenshot!
flash['notice'] = "Screenshot approved." flash['notice'] = "Screenshot approved."
redirect_to :back redirect_to :back
@ -160,7 +162,7 @@ class PackagesController < ApplicationController
# Receives a form with a simple text field 'description' so that users can update # Receives a form with a simple text field 'description' so that users can update
# the description of their screenshot. # the description of their screenshot.
def update_screenshot_description def update_screenshot_description
@screenshot = Screenshot.find!(params[:id]) @screenshot = Screenshot.find(params[:id])
@screenshot.description = params[:description] @screenshot.description = params[:description]
@screenshot.save! @screenshot.save!
flash['notice'] = "Description updated." flash['notice'] = "Description updated."
@ -169,7 +171,7 @@ class PackagesController < ApplicationController
# Receive an anonymous report from a user to have a screenshot removed. # Receive an anonymous report from a user to have a screenshot removed.
def report_screenshot def report_screenshot
@screenshot = Screenshot.find!(params[:id]) @screenshot = Screenshot.find(params[:id])
@screenshot.delete_reason = params[:delete_reason] @screenshot.delete_reason = params[:delete_reason]
@screenshot.markedfordelete = true @screenshot.markedfordelete = true
@screenshot.save! @screenshot.save!

4
app/models/package.rb
View file

@ -71,8 +71,8 @@ class Package < ActiveRecord::Base
private private
def version_compare(x,y) def version_compare(x,y)
x ||= '0' x = '0' unless x.present?
y ||= '0' y = '0' unless y.present?
version_x = DebImporter::Version.new(x) version_x = DebImporter::Version.new(x)
version_y = DebImporter::Version.new(y) version_y = DebImporter::Version.new(y)
if version_x<version_y if version_x<version_y

16
app/views/packages/details.slim
View file

@ -13,14 +13,14 @@
.text-center .text-center
a.black.fancybox href=screenshot.image.url(:large, timestamp: false) rel='fancybox-thumb' title=screenshot.caption 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) = image_tag(screenshot.image.url(:large, timestamp: false), alt: screenshot.caption)
div - if screenshot.description
- if screenshot.description .imgcaption =screenshot.description
.imgcaption =screenshot.description - if screenshot.version.present?
- if screenshot.version.present? .imgcaption
em.imgcaption em from version #{screenshot.version}
'(from version #{screenshot.version}) - if user_signed_in?
- if user_signed_in? .imgcaption
em.imgcaption Admin status: #{screenshot.adminstatus} em Admin status: #{screenshot.adminstatus}
// Is the user an admin? // Is the user an admin?
- if user_signed_in? - if user_signed_in?

6
config/routes.rb
View file

@ -28,9 +28,11 @@ Debshots::Application.routes.draw do
get 'approve_screenshot/:id' => 'packages#approve_screenshot', as: :approve_screenshot get 'approve_screenshot/:id' => 'packages#approve_screenshot', as: :approve_screenshot
get 'about' => 'welcome#about' get 'about' => 'welcome#about'
get 'thumbnail/:name' => 'packages#thumbnail', as: :thumbnail_image, name: /[^\/]+/ get 'thumbnail/:name' => 'packages#thumbnail', as: :thumbnail_image, name: /[^\/]+/
get 'thumbnail-with-version/:name/:version' => 'packages#thumbnail', name: /[^\/]+/, version: /\S+/ get 'thumbnail-404/:name' => 'packages#thumbnail', name: /[^\/]+/
get 'thumbnail-with-version/:name/:version' => 'packages#thumbnail', name: /[^\/]+/, version: /\d.*/
get 'screenshot/:name' => 'packages#screenshot', as: :screenshot_image, name: /[^\/]+/ get 'screenshot/:name' => 'packages#screenshot', as: :screenshot_image, name: /[^\/]+/
get 'screenshot-with-version/:name/:version' => 'packages#screenshot', name: /[^\/]+/, version: /\S+/ get 'screenshot-404/:name' => 'packages#screenshot', name: /[^\/]+/
get 'screenshot-with-version/:name/:version' => 'packages#screenshot', name: /[^\/]+/, version: /\d.*/
# Legacy URLs # Legacy URLs
get 'with_screenshots', to: redirect('/packages?show=with') get 'with_screenshots', to: redirect('/packages?show=with')