maverick/docbrown
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add user status from profiles to the report section (#19240)

Browse source
This commit is contained in:
Rajat Talesra 2023-03-24 01:17:41 +05:30 • committed by GitHub
parent c285cf8f9e
commit 54eb412593
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 15 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
app/views/admin/feedback_messages/_feedback_message.html.erb
View file

@ -29,8 +29,11 @@
</h3>
<h3 class="crayons-subtitle-2 fw-normal">
<% if feedback_message.reporter_id? %>
<%= feedback_message.reporter.name %>
<a href="<%= feedback_message.reporter.path %>">@<%= feedback_message.reporter.username %></a>
<div class="flex flex-1 items-center">
<%= feedback_message.reporter.name %>
<a href="<%= feedback_message.reporter.path %>">@<%= feedback_message.reporter.username %></a>
<%= render partial: "admin/users/show/profile/status", locals: { user: feedback_message.reporter} %>
</div>
<% else %>
Anonymous
<% end %>
@ -41,8 +44,11 @@
Offender:
</h3>
<h3 class="crayons-subtitle-2 fw-normal">
<%= feedback_message.offender.name %>
<a href="<%= feedback_message.offender.path %>">@<%= feedback_message.offender.username %></a>
<div class="flex flex-1 items-center">
<%= feedback_message.offender.name %>
<a href="<%= feedback_message.offender.path %>">@<%= feedback_message.offender.username %></a>
<%= render partial: "admin/users/show/profile/status", locals: { user: feedback_message.offender} %>
</div>
</h3>
<% else %>
<h3 class="crayons-subtitle-2">

2
app/views/admin/users/show/_profile.html.erb
View file

@ -18,7 +18,7 @@
<h1 class="crayons-title lh-tight">
<%= @user.name %>
</h1>
<%= render "admin/users/show/profile/status" %>
<%= render partial: "admin/users/show/profile/status", locals: { user: @user} %>
</div>
<%= render "admin/users/show/profile/actions" %>
</div>

8
app/views/admin/users/show/profile/_status.html.erb
View file

@ -1,12 +1,12 @@
<span class="ml-3 whitespace-nowrap" title="<%= t("views.admin.users.status_title") %>">
<span class="screen-reader-only"><%= t("views.admin.users.status_reader") %></span>
<% if @user.suspended? %>
<% if user.suspended? %>
<span data-testid="user-status" class="c-indicator c-indicator--danger c-indicator--relaxed"><%= t("views.admin.users.statuses.Suspended") %></span>
<% elsif @user.warned? %>
<% elsif user.warned? %>
<span data-testid="user-status" class="c-indicator c-indicator--warning c-indicator--relaxed"><%= t("views.admin.users.statuses.Warned") %></span>
<% elsif @user.comment_suspended? %>
<% elsif user.comment_suspended? %>
<span data-testid="user-status" class="c-indicator c-indicator--warning c-indicator--relaxed"><%= t("views.admin.users.statuses.Comment Suspended") %></span>
<% elsif @user.trusted? %>
<% elsif user.trusted? %>
<span data-testid="user-status" class="c-indicator c-indicator--success c-indicator--relaxed"><%= t("views.admin.users.statuses.Trusted") %></span>
<% else %>
<span data-testid="user-status" class="c-indicator c-indicator--relaxed"><%= t("views.admin.users.statuses.Good standing") %></span>