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

Remove hidden comments test from controller tests

Browse source
This commit is contained in:
Anton Khorev 2024-01-08 16:14:15 +03:00
parent 55bb243731
commit 2b8798d769
2 changed files with 31 additions and 47 deletions
Download patch file Download diff file Expand all files Collapse all files

64
app/views/browse/changeset.html.erb
View file

@ -27,41 +27,39 @@
</div>
<% if @comments.length > 0 %>
<div class='changeset-comments'>
<form action="#">
<ul class="list-unstyled">
<% @comments.each do |comment| %>
<% if comment.visible %>
<li id="c<%= comment.id %>">
<small class='text-muted'>
<%= t(".comment_by_html",
:time_ago => friendly_date_ago(comment.created_at),
:user => link_to(comment.author.display_name, user_path(comment.author))) %>
<% if current_user and current_user.moderator? %>
— <button class="btn btn-sm small btn-link link-secondary p-0 align-baseline" data-method="POST" data-url="<%= changeset_comment_hide_url(comment.id) %>"><%= t("javascripts.changesets.show.hide_comment") %></button>
<% end %>
<form action="#">
<ul class="list-unstyled">
<% @comments.each do |comment| %>
<% if comment.visible %>
<li id="c<%= comment.id %>">
<small class='text-muted'>
<%= t(".comment_by_html",
:time_ago => friendly_date_ago(comment.created_at),
:user => link_to(comment.author.display_name, user_path(comment.author))) %>
<% if current_user and current_user.moderator? %>
— <button class="btn btn-sm small btn-link link-secondary p-0 align-baseline" data-method="POST" data-url="<%= changeset_comment_hide_url(comment.id) %>"><%= t("javascripts.changesets.show.hide_comment") %></button>
<% end %>
</small>
<div class="mx-2">
<%= comment.body.to_html %>
</div>
</li>
<% elsif current_user and current_user.moderator? %>
<li id="c<%= comment.id %>">
<small class='text-muted'>
<%= t(".hidden_comment_by_html",
:time_ago => friendly_date_ago(comment.created_at),
:user => link_to(comment.author.display_name, user_path(comment.author))) %>
— <button class="btn btn-sm small btn-link link-secondary p-0 align-baseline" data-method="POST" data-url="<%= changeset_comment_unhide_url(comment.id) %>"><%= t("javascripts.changesets.show.unhide_comment") %></button>
</small>
<div class="mx-2">
<%= comment.body.to_html %>
</div>
</li>
<% elsif current_user and current_user.moderator? %>
<li id="c<%= comment.id %>">
<small class='text-muted'>
<%= t(".hidden_comment_by_html",
:time_ago => friendly_date_ago(comment.created_at),
:user => link_to(comment.author.display_name, user_path(comment.author))) %>
— <button class="btn btn-sm small btn-link link-secondary p-0 align-baseline" data-method="POST" data-url="<%= changeset_comment_unhide_url(comment.id) %>"><%= t("javascripts.changesets.show.unhide_comment") %></button>
</small>
<div class="mx-2">
<%= comment.body.to_html %>
</div>
</li>
<% end %>
<div class="mx-2">
<%= comment.body.to_html %>
</div>
</li>
<% end %>
</ul>
</form>
</div>
<% end %>
</ul>
</form>
<% end %>
<% unless current_user %>