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

Simplify link_to user calls on block pages

Browse source
This commit is contained in:
Anton Khorev 2024-03-20 04:27:58 +03:00
parent 188a6e175e
commit 8557179976
9 changed files with 50 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

6
app/views/user_blocks/_block.html.erb
View file

@ -1,9 +1,9 @@
<tr> <tr>
<% if show_user_name %> <% if show_user_name %>
<td><%= link_to block.user.display_name, user_path(block.user) %></td> <td><%= link_to block.user.display_name, block.user %></td>
<% end %> <% end %>
<% if show_creator_name %> <% if show_creator_name %>
<td><%= link_to block.creator.display_name, user_path(block.creator) %></td> <td><%= link_to block.creator.display_name, block.creator %></td>
<% end %> <% end %>
<td><%= h truncate(block.reason) %></td> <td><%= h truncate(block.reason) %></td>
<td><%= h block_status(block) %></td> <td><%= h block_status(block) %></td>
@ -11,7 +11,7 @@
<% if block.revoker_id.nil? %> <% if block.revoker_id.nil? %>
<%= t(".not_revoked") %> <%= t(".not_revoked") %>
<% else %> <% else %>
<%= link_to block.revoker.display_name, user_path(block.revoker) %> <%= link_to block.revoker.display_name, block.revoker %>
<% end %> <% end %>
</td> </td>
<td><%= link_to t(".show"), block %></td> <td><%= link_to t(".show"), block %></td>

2
app/views/user_blocks/blocks_by.html.erb
View file

@ -1,6 +1,6 @@
<% @title = t(".title", :name => @user.display_name) %> <% @title = t(".title", :name => @user.display_name) %>
<% content_for :heading do %> <% content_for :heading do %>
<h1><%= t(".heading_html", :name => link_to(@user.display_name, user_path(@user))) %></h1> <h1><%= t(".heading_html", :name => link_to(@user.display_name, @user)) %></h1>
<% end %> <% end %>
<% unless @user_blocks.empty? %> <% unless @user_blocks.empty? %>

2
app/views/user_blocks/blocks_on.html.erb
View file

@ -1,6 +1,6 @@
<% @title = t(".title", :name => @user.display_name) %> <% @title = t(".title", :name => @user.display_name) %>
<% content_for :heading do %> <% content_for :heading do %>
<h1><%= t(".heading_html", :name => link_to(@user.display_name, user_path(@user))) %></h1> <h1><%= t(".heading_html", :name => link_to(@user.display_name, @user)) %></h1>
<% end %> <% end %>
<% unless @user_blocks.empty? %> <% unless @user_blocks.empty? %>

4
app/views/user_blocks/edit.html.erb
View file

@ -1,8 +1,6 @@
<% @title = t ".title", :name => @user_block.user.display_name %> <% @title = t ".title", :name => @user_block.user.display_name %>
<% content_for :heading do %> <% content_for :heading do %>
<h1><%= t(".heading_html", <h1><%= t(".heading_html", :name => link_to(@user_block.user.display_name, @user_block.user)) %></h1>
:name => link_to(@user_block.user.display_name,
user_path(@user_block.user))) %></h1>
<nav class='secondary-actions'> <nav class='secondary-actions'>
<ul class='clearfix'> <ul class='clearfix'>
<li><%= link_to t(".show"), @user_block %></li> <li><%= link_to t(".show"), @user_block %></li>

4
app/views/user_blocks/new.html.erb
View file

@ -1,8 +1,6 @@
<% @title = t ".title", :name => @user.display_name %> <% @title = t ".title", :name => @user.display_name %>
<% content_for :heading do %> <% content_for :heading do %>
<h1><%= t(".heading_html", <h1><%= t(".heading_html", :name => link_to(@user.display_name, @user)) %></h1>
:name => link_to(@user.display_name,
user_path(@user))) %></h1>
<% end %> <% end %>
<%= bootstrap_form_for(@user_block) do |f| %> <%= bootstrap_form_for(@user_block) do |f| %>
<%= hidden_field_tag "display_name", @user.display_name, :autocomplete => "off" %> <%= hidden_field_tag "display_name", @user.display_name, :autocomplete => "off" %>

6
app/views/user_blocks/revoke.html.erb
View file

@ -4,10 +4,8 @@
<% content_for :heading do %> <% content_for :heading do %>
<h1><%= t(".heading_html", <h1><%= t(".heading_html",
:block_on => link_to(@user_block.user.display_name, :block_on => link_to(@user_block.user.display_name, @user_block.user),
user_path(@user_block.user)), :block_by => link_to(@user_block.creator.display_name, @user_block.creator)) %></h1>
:block_by => link_to(@user_block.creator.display_name,
user_path(@user_block.creator))) %></h1>
<% end %> <% end %>
<% if @user_block.ends_at > Time.now %> <% if @user_block.ends_at > Time.now %>

7
app/views/user_blocks/revoke_all.html.erb
View file

@ -1,10 +1,7 @@
<% @title = t ".title", <% @title = t ".title", :block_on => @user.display_name %>
:block_on => @user.display_name %>
<% content_for :heading do %> <% content_for :heading do %>
<h1><%= t ".heading_html", <h1><%= t ".heading_html", :block_on => link_to(@user.display_name, @user) %></h1>
:block_on => link_to(@user.display_name,
user_path(@user)) %></h1>
<% end %> <% end %>
<% unless @user.blocks.active.empty? %> <% unless @user.blocks.active.empty? %>

8
app/views/user_blocks/show.html.erb
View file

@ -4,10 +4,8 @@
<% content_for :heading do %> <% content_for :heading do %>
<h1><%= t(".heading_html", <h1><%= t(".heading_html",
:block_on => link_to(@user_block.user.display_name, :block_on => link_to(@user_block.user.display_name, @user_block.user),
user_path(@user_block.user)), :block_by => link_to(@user_block.creator.display_name, @user_block.creator)) %></h1>
:block_by => link_to(@user_block.creator.display_name,
user_path(@user_block.creator))) %></h1>
<nav class='secondary-actions'> <nav class='secondary-actions'>
<ul class='clearfix'> <ul class='clearfix'>
<% if @user_block.ends_at > Time.now.getutc %> <% if @user_block.ends_at > Time.now.getutc %>
@ -26,7 +24,7 @@
<dl class="row"> <dl class="row">
<% if @user_block.revoker %> <% if @user_block.revoker %>
<dt class="col-sm-3"><%= t ".revoker" %></dt> <dt class="col-sm-3"><%= t ".revoker" %></dt>
<dd class="col-sm-9"><%= link_to @user_block.revoker.display_name, user_path(@user_block.revoker) %></dd> <dd class="col-sm-9"><%= link_to @user_block.revoker.display_name, @user_block.revoker %></dd>
<% end %> <% end %>
<dt class="col-sm-3"><%= t ".created" %></dt> <dt class="col-sm-3"><%= t ".created" %></dt>

48
test/controllers/user_blocks_controller_test.rb
View file

@ -67,14 +67,23 @@ class UserBlocksControllerTest < ActionDispatch::IntegrationTest
## ##
# test the index action # test the index action
def test_index def test_index
active_block = create(:user_block)
expired_block = create(:user_block, :expired)
revoked_block = create(:user_block, :revoked) revoked_block = create(:user_block, :revoked)
get user_blocks_path get user_blocks_path
assert_response :success assert_response :success
assert_select "table#block_list", :count => 1 do assert_select "table#block_list tbody tr", :count => 1 do
assert_select "tr", 4 assert_select "a[href='#{user_path revoked_block.user}']", :text => revoked_block.user.display_name
assert_select "a[href='#{user_path revoked_block.creator}']", :text => revoked_block.creator.display_name
assert_select "a[href='#{user_path revoked_block.revoker}']", :text => revoked_block.revoker.display_name
end
active_block = create(:user_block)
expired_block = create(:user_block, :expired)
get user_blocks_path
assert_response :success
assert_select "table#block_list tbody", :count => 1 do
assert_select "tr", 3
assert_select "a[href='#{user_block_path(active_block)}']", 1 assert_select "a[href='#{user_block_path(active_block)}']", 1
assert_select "a[href='#{user_block_path(expired_block)}']", 1 assert_select "a[href='#{user_block_path(expired_block)}']", 1
assert_select "a[href='#{user_block_path(revoked_block)}']", 1 assert_select "a[href='#{user_block_path(revoked_block)}']", 1
@ -115,14 +124,21 @@ class UserBlocksControllerTest < ActionDispatch::IntegrationTest
# Viewing an expired block should work # Viewing an expired block should work
get user_block_path(:id => expired_block) get user_block_path(:id => expired_block)
assert_response :success assert_response :success
assert_select "h1 a[href='#{user_path expired_block.user}']", :text => expired_block.user.display_name
assert_select "h1 a[href='#{user_path expired_block.creator}']", :text => expired_block.creator.display_name
# Viewing a revoked block should work # Viewing a revoked block should work
get user_block_path(:id => revoked_block) get user_block_path(:id => revoked_block)
assert_response :success assert_response :success
assert_select "h1 a[href='#{user_path revoked_block.user}']", :text => revoked_block.user.display_name
assert_select "h1 a[href='#{user_path revoked_block.creator}']", :text => revoked_block.creator.display_name
assert_select "a[href='#{user_path revoked_block.revoker}']", :text => revoked_block.revoker.display_name
# Viewing an active block should work, but shouldn't mark it as seen # Viewing an active block should work, but shouldn't mark it as seen
get user_block_path(:id => active_block) get user_block_path(:id => active_block)
assert_response :success assert_response :success
assert_select "h1 a[href='#{user_path active_block.user}']", :text => active_block.user.display_name
assert_select "h1 a[href='#{user_path active_block.creator}']", :text => active_block.creator.display_name
assert UserBlock.find(active_block.id).needs_view assert UserBlock.find(active_block.id).needs_view
# Login as the blocked user # Login as the blocked user
@ -156,6 +172,7 @@ class UserBlocksControllerTest < ActionDispatch::IntegrationTest
# Check that the block creation page loads for moderators # Check that the block creation page loads for moderators
get new_user_block_path(target_user) get new_user_block_path(target_user)
assert_response :success assert_response :success
assert_select "h1 a[href='#{user_path target_user}']", :text => target_user.display_name
assert_select "form#new_user_block", :count => 1 do assert_select "form#new_user_block", :count => 1 do
assert_select "textarea#user_block_reason", :count => 1 assert_select "textarea#user_block_reason", :count => 1
assert_select "select#user_block_period", :count => 1 assert_select "select#user_block_period", :count => 1
@ -193,6 +210,7 @@ class UserBlocksControllerTest < ActionDispatch::IntegrationTest
# Check that the block edit page loads for moderators # Check that the block edit page loads for moderators
get edit_user_block_path(:id => active_block) get edit_user_block_path(:id => active_block)
assert_response :success assert_response :success
assert_select "h1 a[href='#{user_path active_block.user}']", :text => active_block.user.display_name
assert_select "form#edit_user_block_#{active_block.id}", :count => 1 do assert_select "form#edit_user_block_#{active_block.id}", :count => 1 do
assert_select "textarea#user_block_reason", :count => 1 assert_select "textarea#user_block_reason", :count => 1
assert_select "select#user_block_period", :count => 1 assert_select "select#user_block_period", :count => 1
@ -364,6 +382,7 @@ class UserBlocksControllerTest < ActionDispatch::IntegrationTest
get revoke_user_block_path(:id => active_block) get revoke_user_block_path(:id => active_block)
assert_response :success assert_response :success
assert_template "revoke" assert_template "revoke"
assert_select "h1 a[href='#{user_path active_block.user}']", :text => active_block.user.display_name
assert_select "form", :count => 1 do assert_select "form", :count => 1 do
assert_select "input#confirm[type='checkbox']", :count => 1 assert_select "input#confirm[type='checkbox']", :count => 1
assert_select "input[type='submit'][value='Revoke!']", :count => 1 assert_select "input[type='submit'][value='Revoke!']", :count => 1
@ -416,6 +435,7 @@ class UserBlocksControllerTest < ActionDispatch::IntegrationTest
# Check that the revoke all blocks page loads for moderators # Check that the revoke all blocks page loads for moderators
get revoke_all_user_blocks_path(blocked_user) get revoke_all_user_blocks_path(blocked_user)
assert_response :success assert_response :success
assert_select "h1 a[href='#{user_path blocked_user}']", :text => blocked_user.display_name
end end
## ##
@ -490,8 +510,9 @@ class UserBlocksControllerTest < ActionDispatch::IntegrationTest
# Check the list of blocks for a user that is currently blocked # Check the list of blocks for a user that is currently blocked
get user_blocks_on_path(blocked_user) get user_blocks_on_path(blocked_user)
assert_response :success assert_response :success
assert_select "table#block_list", :count => 1 do assert_select "h1 a[href='#{user_path blocked_user}']", :text => blocked_user.display_name
assert_select "tr", 3 assert_select "table#block_list tbody", :count => 1 do
assert_select "tr", 2
assert_select "a[href='#{user_block_path(active_block)}']", 1 assert_select "a[href='#{user_block_path(active_block)}']", 1
assert_select "a[href='#{user_block_path(revoked_block)}']", 1 assert_select "a[href='#{user_block_path(revoked_block)}']", 1
end end
@ -499,8 +520,9 @@ class UserBlocksControllerTest < ActionDispatch::IntegrationTest
# Check the list of blocks for a user that has previously been blocked # Check the list of blocks for a user that has previously been blocked
get user_blocks_on_path(unblocked_user) get user_blocks_on_path(unblocked_user)
assert_response :success assert_response :success
assert_select "table#block_list", :count => 1 do assert_select "h1 a[href='#{user_path unblocked_user}']", :text => unblocked_user.display_name
assert_select "tr", 2 assert_select "table#block_list tbody", :count => 1 do
assert_select "tr", 1
assert_select "a[href='#{user_block_path(expired_block)}']", 1 assert_select "a[href='#{user_block_path(expired_block)}']", 1
end end
end end
@ -543,16 +565,18 @@ class UserBlocksControllerTest < ActionDispatch::IntegrationTest
# Check the list of blocks given by one moderator # Check the list of blocks given by one moderator
get user_blocks_by_path(moderator_user) get user_blocks_by_path(moderator_user)
assert_response :success assert_response :success
assert_select "table#block_list", :count => 1 do assert_select "h1 a[href='#{user_path moderator_user}']", :text => moderator_user.display_name
assert_select "tr", 2 assert_select "table#block_list tbody", :count => 1 do
assert_select "tr", 1
assert_select "a[href='#{user_block_path(active_block)}']", 1 assert_select "a[href='#{user_block_path(active_block)}']", 1
end end
# Check the list of blocks given by a different moderator # Check the list of blocks given by a different moderator
get user_blocks_by_path(second_moderator_user) get user_blocks_by_path(second_moderator_user)
assert_response :success assert_response :success
assert_select "table#block_list", :count => 1 do assert_select "h1 a[href='#{user_path second_moderator_user}']", :text => second_moderator_user.display_name
assert_select "tr", 3 assert_select "table#block_list tbody", :count => 1 do
assert_select "tr", 2
assert_select "a[href='#{user_block_path(expired_block)}']", 1 assert_select "a[href='#{user_block_path(expired_block)}']", 1
assert_select "a[href='#{user_block_path(revoked_block)}']", 1 assert_select "a[href='#{user_block_path(revoked_block)}']", 1
end end