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

Merge pull request #5093 from AntonKhorev/diary-comments-shallow-paths

Browse source 
Use shallow routes for diary comments
This commit is contained in:
Andy Allan 2024-08-28 14:58:53 +01:00 • committed by GitHub
commit b9988bdbc8
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 16 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/views/diary_entries/_diary_comment.html.erb
View file

@ -13,9 +13,9 @@
<% if can? :hide, DiaryComment %>
<span>
<% if diary_comment.visible? %>
<%= link_to t(".hide_link"), hide_diary_comment_path(diary_comment.diary_entry.user, diary_comment.diary_entry, diary_comment), :method => :post, :data => { :confirm => t(".confirm") } %>
<%= link_to t(".hide_link"), hide_diary_comment_path(diary_comment), :method => :post, :data => { :confirm => t(".confirm") } %>
<% else %>
<%= link_to t(".unhide_link"), unhide_diary_comment_path(diary_comment.diary_entry.user, diary_comment.diary_entry, diary_comment), :method => :post, :data => { :confirm => t(".confirm") } %>
<%= link_to t(".unhide_link"), unhide_diary_comment_path(diary_comment), :method => :post, :data => { :confirm => t(".confirm") } %>
<% end %>
</span>
<% end %>

4
config/routes.rb
View file

@ -255,8 +255,8 @@ OpenStreetMap::Application.routes.draw do
match "/user/:display_name/diary/:id/subscribe" => "diary_entries#subscribe", :via => [:get, :post], :as => :diary_entry_subscribe, :id => /\d+/
match "/user/:display_name/diary/:id/unsubscribe" => "diary_entries#unsubscribe", :via => [:get, :post], :as => :diary_entry_unsubscribe, :id => /\d+/
post "/user/:display_name/diary/:id/comments" => "diary_comments#create", :id => /\d+/, :as => :comment_diary_entry
post "/user/:display_name/diary/:id/comments/:comment/hide" => "diary_comments#hide", :id => /\d+/, :comment => /\d+/, :as => :hide_diary_comment
post "/user/:display_name/diary/:id/comments/:comment/unhide" => "diary_comments#unhide", :id => /\d+/, :comment => /\d+/, :as => :unhide_diary_comment
post "/diary_comments/:comment/hide" => "diary_comments#hide", :comment => /\d+/, :as => :hide_diary_comment
post "/diary_comments/:comment/unhide" => "diary_comments#unhide", :comment => /\d+/, :as => :unhide_diary_comment
# user pages
resources :users, :path => "user", :param => :display_name, :only => [:show, :destroy]

24
test/controllers/diary_comments_controller_test.rb
View file

@ -17,12 +17,12 @@ class DiaryCommentsControllerTest < ActionDispatch::IntegrationTest
{ :controller => "diary_comments", :action => "create", :display_name => "username", :id => "1" }
)
assert_routing(
{ :path => "/user/username/diary/1/comments/2/hide", :method => :post },
{ :controller => "diary_comments", :action => "hide", :display_name => "username", :id => "1", :comment => "2" }
{ :path => "/diary_comments/2/hide", :method => :post },
{ :controller => "diary_comments", :action => "hide", :comment => "2" }
)
assert_routing(
{ :path => "/user/username/diary/1/comments/2/unhide", :method => :post },
{ :controller => "diary_comments", :action => "unhide", :display_name => "username", :id => "1", :comment => "2" }
{ :path => "/diary_comments/2/unhide", :method => :post },
{ :controller => "diary_comments", :action => "unhide", :comment => "2" }
)
get "/user/username/diary/comments/1"
@ -186,19 +186,19 @@ class DiaryCommentsControllerTest < ActionDispatch::IntegrationTest
diary_comment = create(:diary_comment, :diary_entry => diary_entry)
# Try without logging in
post hide_diary_comment_path(user, diary_entry, diary_comment)
post hide_diary_comment_path(diary_comment)
assert_response :forbidden
assert DiaryComment.find(diary_comment.id).visible
# Now try as a normal user
session_for(user)
post hide_diary_comment_path(user, diary_entry, diary_comment)
post hide_diary_comment_path(diary_comment)
assert_redirected_to :controller => :errors, :action => :forbidden
assert DiaryComment.find(diary_comment.id).visible
# Try as a moderator
session_for(create(:moderator_user))
post hide_diary_comment_path(user, diary_entry, diary_comment)
post hide_diary_comment_path(diary_comment)
assert_redirected_to diary_entry_path(user, diary_entry)
assert_not DiaryComment.find(diary_comment.id).visible
@ -207,7 +207,7 @@ class DiaryCommentsControllerTest < ActionDispatch::IntegrationTest
# Finally try as an administrator
session_for(create(:administrator_user))
post hide_diary_comment_path(user, diary_entry, diary_comment)
post hide_diary_comment_path(diary_comment)
assert_redirected_to diary_entry_path(user, diary_entry)
assert_not DiaryComment.find(diary_comment.id).visible
end
@ -218,19 +218,19 @@ class DiaryCommentsControllerTest < ActionDispatch::IntegrationTest
diary_comment = create(:diary_comment, :diary_entry => diary_entry, :visible => false)
# Try without logging in
post unhide_diary_comment_path(user, diary_entry, diary_comment)
post unhide_diary_comment_path(diary_comment)
assert_response :forbidden
assert_not DiaryComment.find(diary_comment.id).visible
# Now try as a normal user
session_for(user)
post unhide_diary_comment_path(user, diary_entry, diary_comment)
post unhide_diary_comment_path(diary_comment)
assert_redirected_to :controller => :errors, :action => :forbidden
assert_not DiaryComment.find(diary_comment.id).visible
# Now try as a moderator
session_for(create(:moderator_user))
post unhide_diary_comment_path(user, diary_entry, diary_comment)
post unhide_diary_comment_path(diary_comment)
assert_redirected_to diary_entry_path(user, diary_entry)
assert DiaryComment.find(diary_comment.id).visible
@ -239,7 +239,7 @@ class DiaryCommentsControllerTest < ActionDispatch::IntegrationTest
# Finally try as an administrator
session_for(create(:administrator_user))
post unhide_diary_comment_path(user, diary_entry, diary_comment)
post unhide_diary_comment_path(diary_comment)
assert_redirected_to diary_entry_path(user, diary_entry)
assert DiaryComment.find(diary_comment.id).visible
end