Merge branch 'master' of git.workaround.org:chaas/debshots
This commit is contained in:
commit
a01d2c751c
5 changed files with 21 additions and 17 deletions
|
|
@ -35,6 +35,7 @@ class PackagesController < ApplicationController
|
|||
if new_screenshot.valid?
|
||||
new_screenshot.uploaderhash = session[:token]
|
||||
new_screenshot.uploaderip = session[:ip]
|
||||
new_screenshot.version = @package.version
|
||||
new_screenshot.save
|
||||
successful_upload_count += 1
|
||||
Log.log "Screenshot #{new_screenshot.id} uploaded successfully."
|
||||
|
|
@ -70,6 +71,7 @@ class PackagesController < ApplicationController
|
|||
if new_screenshot.valid?
|
||||
# new_screenshot.uploaderhash = session[:token]
|
||||
new_screenshot.uploaderip = session[:ip]
|
||||
new_screenshot.version = @package.version
|
||||
new_screenshot.save
|
||||
Log.log "Screenshot #{new_screenshot.id} uploaded successfully from legacy upload form."
|
||||
redirect_to package_path(params[:packagename])
|
||||
|
|
@ -81,7 +83,7 @@ class PackagesController < ApplicationController
|
|||
|
||||
def delete_screenshot
|
||||
# Is the user allowed to delete the screenshot?
|
||||
@screenshot = Screenshot.find!(params[:id])
|
||||
@screenshot = Screenshot.find(params[:id])
|
||||
|
||||
if user_can_alter_screenshot?
|
||||
@screenshot.destroy
|
||||
|
|
@ -93,7 +95,7 @@ class PackagesController < ApplicationController
|
|||
end
|
||||
|
||||
def approve_screenshot
|
||||
@screenshot = Screenshot.find!(params[:id])
|
||||
@screenshot = Screenshot.find(params[:id])
|
||||
@screenshot.approve_screenshot!
|
||||
flash['notice'] = "Screenshot approved."
|
||||
redirect_to :back
|
||||
|
|
@ -160,7 +162,7 @@ class PackagesController < ApplicationController
|
|||
# Receives a form with a simple text field 'description' so that users can update
|
||||
# the description of their screenshot.
|
||||
def update_screenshot_description
|
||||
@screenshot = Screenshot.find!(params[:id])
|
||||
@screenshot = Screenshot.find(params[:id])
|
||||
@screenshot.description = params[:description]
|
||||
@screenshot.save!
|
||||
flash['notice'] = "Description updated."
|
||||
|
|
@ -169,7 +171,7 @@ class PackagesController < ApplicationController
|
|||
|
||||
# Receive an anonymous report from a user to have a screenshot removed.
|
||||
def report_screenshot
|
||||
@screenshot = Screenshot.find!(params[:id])
|
||||
@screenshot = Screenshot.find(params[:id])
|
||||
@screenshot.delete_reason = params[:delete_reason]
|
||||
@screenshot.markedfordelete = true
|
||||
@screenshot.save!
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@ class Log < ActiveRecord::Base
|
|||
|
||||
validates :section, presence: true
|
||||
validates :section, inclusion: { in: ['importer', 'upload', 'frontend'] }
|
||||
|
||||
|
||||
validates :level, presence: true
|
||||
validates :level, inclusion: { in: ['info', 'error'] }
|
||||
|
||||
|
|
|
|||
|
|
@ -71,8 +71,8 @@ class Package < ActiveRecord::Base
|
|||
private
|
||||
|
||||
def version_compare(x,y)
|
||||
x ||= '0'
|
||||
y ||= '0'
|
||||
x = '0' unless x.present?
|
||||
y = '0' unless y.present?
|
||||
version_x = DebImporter::Version.new(x)
|
||||
version_y = DebImporter::Version.new(y)
|
||||
if version_x<version_y
|
||||
|
|
|
|||
|
|
@ -13,14 +13,14 @@
|
|||
.text-center
|
||||
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)
|
||||
div
|
||||
- if screenshot.description
|
||||
.imgcaption =screenshot.description
|
||||
- if screenshot.version.present?
|
||||
em.imgcaption
|
||||
'(from version #{screenshot.version})
|
||||
- if user_signed_in?
|
||||
em.imgcaption Admin status: #{screenshot.adminstatus}
|
||||
- if screenshot.description
|
||||
.imgcaption =screenshot.description
|
||||
- if screenshot.version.present?
|
||||
.imgcaption
|
||||
em from version #{screenshot.version}
|
||||
- if user_signed_in?
|
||||
.imgcaption
|
||||
em Admin status: #{screenshot.adminstatus}
|
||||
|
||||
// Is the user an admin?
|
||||
- if user_signed_in?
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue