cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Allow admins and moderators to delete traces

Browse source 
Fixes #1625
This commit is contained in:
biswesh456 2018-02-24 20:36:12 +05:30
parent c32a63058c
commit 646dcb62fc
3 changed files with 16 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/controllers/trace_controller.rb
View file

@ -186,7 +186,7 @@ class TraceController < ApplicationController
if !trace.visible? if !trace.visible?
head :not_found head :not_found
elsif current_user.nil? || trace.user != current_user elsif current_user.nil? || (trace.user != current_user && !current_user.administrator? && !current_user.moderator?)
head :forbidden head :forbidden
else else
trace.visible = false trace.visible = false

4
app/views/trace/view.html.erb
View file

@ -54,9 +54,11 @@
<br /><br /> <br /><br />
<%= if_user(@trace.user) do %> <% if current_user && (current_user==@trace.user || current_user.administrator? || current_user.moderator?)%>
<div class="buttons"> <div class="buttons">
<%= if_user(@trace.user) do %>
<%= button_to t('trace.view.edit_track'), :controller => 'trace', :action => 'edit', :id => @trace.id %> <%= button_to t('trace.view.edit_track'), :controller => 'trace', :action => 'edit', :id => @trace.id %>
<% end %>
<%= button_to t('trace.view.delete_track'), :controller => 'trace', :action => 'delete', :id => @trace.id %> <%= button_to t('trace.view.delete_track'), :controller => 'trace', :action => 'delete', :id => @trace.id %>
</div> </div>
<% end %> <% end %>

12
test/controllers/trace_controller_test.rb
View file

@ -679,12 +679,22 @@ class TraceControllerTest < ActionController::TestCase
post :delete, :params => { :display_name => deleted_trace_file.user.display_name, :id => deleted_trace_file.id }, :session => { :user => deleted_trace_file.user } post :delete, :params => { :display_name => deleted_trace_file.user.display_name, :id => deleted_trace_file.id }, :session => { :user => deleted_trace_file.user }
assert_response :not_found assert_response :not_found
# Finally with a trace that we are allowed to delete # Now with a trace that we are allowed to delete
post :delete, :params => { :display_name => public_trace_file.user.display_name, :id => public_trace_file.id }, :session => { :user => public_trace_file.user } post :delete, :params => { :display_name => public_trace_file.user.display_name, :id => public_trace_file.id }, :session => { :user => public_trace_file.user }
assert_response :redirect assert_response :redirect
assert_redirected_to :action => :list, :display_name => public_trace_file.user.display_name assert_redirected_to :action => :list, :display_name => public_trace_file.user.display_name
trace = Trace.find(public_trace_file.id) trace = Trace.find(public_trace_file.id)
assert_equal false, trace.visible assert_equal false, trace.visible
# Finally with a trace that is deleted by an admin
public_trace_file = create(:trace, :visibility => "public")
admin = create(:administrator_user)
post :delete, :params => { :display_name => admin.display_name, :id => public_trace_file.id }, :session => { :user => admin }
assert_response :redirect
assert_redirected_to :action => :list, :display_name => admin.display_name
trace = Trace.find(public_trace_file.id)
assert_equal false, trace.visible
end end
# Check getting a specific trace through the api # Check getting a specific trace through the api