From 34c5af86842c646491cd34a03c0cb392aab34fe1 Mon Sep 17 00:00:00 2001 From: Christoph Haas Date: Mon, 13 Jun 2016 17:54:19 +0200 Subject: [PATCH] Package names removed as arguments. screenshot.id is sufficient --- app/views/packages/_admin_dropdown.slim | 8 ++++---- app/views/packages/_report_dropdown.slim | 2 +- config/routes.rb | 6 +++--- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/app/views/packages/_admin_dropdown.slim b/app/views/packages/_admin_dropdown.slim index 1babe6e..a55b381 100644 --- a/app/views/packages/_admin_dropdown.slim +++ b/app/views/packages/_admin_dropdown.slim @@ -3,13 +3,13 @@ button.small.dropdown.warning.button type="button" data-toggle="admin-info-#{screenshot.id}" 'Admin .dropdown-pane data-dropdown=true id="admin-info-#{screenshot.id}" - - unless screenshot.approved + - if not screenshot.approved or screenshot.markedfordelete a.button.small.success[ - href=approve_screenshot_path(@package.name, screenshot.id) + href=approve_screenshot_path(screenshot.id) method='post' - ] Approve screenshot + ] Keep/approve screenshot 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?');" ] Delete screenshot diff --git a/app/views/packages/_report_dropdown.slim b/app/views/packages/_report_dropdown.slim index 8a39997..69dad7a 100644 --- a/app/views/packages/_report_dropdown.slim +++ b/app/views/packages/_report_dropdown.slim @@ -7,6 +7,6 @@ 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 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 = submit_tag 'Request removal', class: 'button alert' diff --git a/config/routes.rb b/config/routes.rb index 0734668..e1f1d01 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -20,11 +20,11 @@ Debshots::Application.routes.draw do get 'upload/:name' => 'packages#upload', as: :upload_package_by_name post 'upload_image/:name' => 'packages#upload_image', as: :upload_image, name: /[^\/]+/ # 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 '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 - 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 'thumbnail/:name' => 'packages#thumbnail', as: :thumbnail_image, name: /[^\/]+/