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

Package names removed as arguments. screenshot.id is sufficient

Browse source
This commit is contained in:
Christoph Haas 2016-06-13 17:54:19 +02:00
parent 6b83cf7135
commit 34c5af8684
3 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

8
app/views/packages/_admin_dropdown.slim
View file

@ -3,13 +3,13 @@
button.small.dropdown.warning.button type="button" data-toggle="admin-info-#{screenshot.id}" button.small.dropdown.warning.button type="button" data-toggle="admin-info-#{screenshot.id}"
'Admin 'Admin
.dropdown-pane data-dropdown=true id="admin-info-#{screenshot.id}" .dropdown-pane data-dropdown=true id="admin-info-#{screenshot.id}"
- unless screenshot.approved - if not screenshot.approved or screenshot.markedfordelete
a.button.small.success[ a.button.small.success[
href=approve_screenshot_path(@package.name, screenshot.id) href=approve_screenshot_path(screenshot.id)
method='post' method='post'
] Approve screenshot ] Keep/approve screenshot
a.button.small.alert[ a.button.small.alert[
href=delete_screenshot_path(@package.name, screenshot.id) href=delete_screenshot_path(screenshot.id)
onclick="return confirm('Really delete the screenshot?');" onclick="return confirm('Really delete the screenshot?');"
] Delete screenshot ] Delete screenshot

2
app/views/packages/_report_dropdown.slim
View file

@ -7,6 +7,6 @@
or is misleading or not useful then please report it so that or is misleading or not useful then please report it so that
the moderators can review it. Just let us know why you think the moderators can review it. Just let us know why you think
the screenshot should get removed: the screenshot should get removed:
= form_tag(report_screenshot_path(screenshot.package.name, screenshot.id)) = form_tag(report_screenshot_path(screenshot.id))
= text_area_tag 'delete_reason', nil, class: 'input-group-field', maxlength: 100, rows: 3, cols: 50 = text_area_tag 'delete_reason', nil, class: 'input-group-field', maxlength: 100, rows: 3, cols: 50
= submit_tag 'Request removal', class: 'button alert' = submit_tag 'Request removal', class: 'button alert'

6
config/routes.rb
View file

@ -20,11 +20,11 @@ Debshots::Application.routes.draw do
get 'upload/:name' => 'packages#upload', as: :upload_package_by_name get 'upload/:name' => 'packages#upload', as: :upload_package_by_name
post 'upload_image/:name' => 'packages#upload_image', as: :upload_image, name: /[^\/]+/ post 'upload_image/:name' => 'packages#upload_image', as: :upload_image, name: /[^\/]+/
# TODO: "get" is probably the wrong method to delete a screenshot # TODO: "get" is probably the wrong method to delete a screenshot
get 'delete_screenshot/:name/:id' => 'packages#delete_screenshot', as: :delete_screenshot get 'delete_screenshot/:id' => 'packages#delete_screenshot', as: :delete_screenshot
post 'update_screenshot_description/:name/:id' => 'packages#update_screenshot_description', as: :update_screenshot_description post 'update_screenshot_description/:name/:id' => 'packages#update_screenshot_description', as: :update_screenshot_description
post 'report_screenshot/:name/:id' => 'packages#report_screenshot', as: :report_screenshot post 'report_screenshot/:id' => 'packages#report_screenshot', as: :report_screenshot
# TODO: "get" is probably the wrong method to delete a screenshot # TODO: "get" is probably the wrong method to delete a screenshot
get 'approve_screenshot/:name/: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: /[^\/]+/