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

Truncate if necessary and set dir=auto for note usernames

Browse source
This commit is contained in:
Anton Khorev 2024-12-04 13:53:20 +03:00
parent 572d1adaae
commit 16e97c57ca
3 changed files with 43 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

3
app/helpers/note_helper.rb
View file

@ -18,7 +18,8 @@ module NoteHelper
elsif author.status == "deleted" elsif author.status == "deleted"
t("users.no_such_user.deleted") t("users.no_such_user.deleted")
else else
link_to h(author.display_name), link_options.merge(:controller => "/users", :action => "show", :display_name => author.display_name) link_to h(author.display_name), link_options.merge(:controller => "/users", :action => "show", :display_name => author.display_name),
:class => "mw-100 d-inline-block align-bottom text-truncate text-wrap", :dir => "auto"
end end
end end
end end

24
app/views/notes/show.html.erb
View file

@ -9,19 +9,17 @@
</div> </div>
<div class="details" data-coordinates="<%= @note.lat %>,<%= @note.lon %>" data-status="<%= @note.status %>"> <div class="details" data-coordinates="<%= @note.lat %>,<%= @note.lon %>" data-status="<%= @note.status %>">
<ul class="list-unstyled"> <p class="mb-2"><%= note_event("opened", @note.created_at, @note.author) %></p>
<li><%= note_event("opened", @note.created_at, @note.author) %></li> <% if @note.status == "closed" %>
<% if @note.status == "closed" %> <p class="mb-2"><%= note_event(@note.status, @note.closed_at, @note.all_comments.last.author) %></p>
<li><%= note_event(@note.status, @note.closed_at, @note.all_comments.last.author) %></li> <% end %>
<% end %> <p>
<li> <%= t "browse.location" %>
<%= t "browse.location" %> <%= link_to t(".coordinates_html",
<%= link_to(t(".coordinates_html", :latitude => tag.span(number_with_delimiter(@note.lat), :class => "latitude"),
:latitude => tag.span(number_with_delimiter(@note.lat), :class => "latitude"), :longitude => tag.span(number_with_delimiter(@note.lon), :class => "longitude")),
:longitude => tag.span(number_with_delimiter(@note.lon), :class => "longitude")), root_path(:anchor => "map=18/#{@note.lat}/#{@note.lon}") %>
root_path(:anchor => "map=18/#{@note.lat}/#{@note.lon}")) %> </p>
</li>
</ul>
</div> </div>
<% if @note_comments.find { |comment| comment.author.nil? } -%> <% if @note_comments.find { |comment| comment.author.nil? } -%>

34
test/helpers/note_helper_test.rb
View file

@ -8,8 +8,25 @@ class NoteHelperTest < ActionView::TestCase
date = Time.utc(2014, 3, 5, 21, 37, 45) date = Time.utc(2014, 3, 5, 21, 37, 45)
user = create(:user) user = create(:user)
assert_match %r{^Created by anonymous <time title=" 5 March 2014 at 21:37" datetime="2014-03-05T21:37:45Z">.* ago</time>$}, note_event("opened", date, nil) note_event_dom = Rails::Dom::Testing.html_document_fragment.parse "<div>#{note_event('opened', date, nil)}</div>"
assert_match %r{^Resolved by <a href="/user/#{ERB::Util.u(user.display_name)}">#{user.display_name}</a> <time title=" 5 March 2014 at 21:37" datetime="2014-03-05T21:37:45Z">.* ago</time>$}, note_event("closed", date, user) assert_dom note_event_dom, ":root", :text => /^Created by anonymous .* ago$/ do
assert_dom "> a", :count => 0
assert_dom "> time", :count => 1 do
assert_dom "> @title", "5 March 2014 at 21:37"
assert_dom "> @datetime", "2014-03-05T21:37:45Z"
end
end
note_event_dom = Rails::Dom::Testing.html_document_fragment.parse "<div>#{note_event('closed', date, user)}</div>"
assert_dom note_event_dom, ":root", :text => /^Resolved by #{user.display_name} .* ago$/ do
assert_dom "> a", :count => 1, :text => user.display_name do
assert_dom "> @href", "/user/#{ERB::Util.u(user.display_name)}"
end
assert_dom "> time", :count => 1 do
assert_dom "> @title", "5 March 2014 at 21:37"
assert_dom "> @datetime", "2014-03-05T21:37:45Z"
end
end
end end
def test_note_author def test_note_author
@ -17,8 +34,17 @@ class NoteHelperTest < ActionView::TestCase
user = create(:user) user = create(:user)
assert_equal "", note_author(nil) assert_equal "", note_author(nil)
assert_equal "deleted", note_author(deleted_user) assert_equal "deleted", note_author(deleted_user)
assert_equal "<a href=\"/user/#{ERB::Util.u(user.display_name)}\">#{user.display_name}</a>", note_author(user)
assert_equal "<a href=\"http://test.host/user/#{ERB::Util.u(user.display_name)}\">#{user.display_name}</a>", note_author(user, :only_path => false) note_author_dom = Rails::Dom::Testing.html_document_fragment.parse note_author(user)
assert_dom note_author_dom, "a:root", :text => user.display_name do
assert_dom "> @href", "/user/#{ERB::Util.u(user.display_name)}"
end
note_author_dom = Rails::Dom::Testing.html_document_fragment.parse note_author(user, :only_path => false)
assert_dom note_author_dom, "a:root", :text => user.display_name do
assert_dom "> @href", "http://test.host/user/#{ERB::Util.u(user.display_name)}"
end
end end
end end