Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Added Reporting time in Global Moderation / Users #10213

Merged
merged 5 commits into from
Jan 18, 2023
Merged

Added Reporting time in Global Moderation / Users #10213

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ae615b0
added-reported-time-to-user-moderations
JoonasAapro Jan 10, 2023
ce3c5ee
deleted-extra-line
JoonasAapro Jan 10, 2023
493aa36
locale-changes
JoonasAapro Jan 10, 2023
d2afca4
fields reorder/contentmoderations - localizations revert
JoonasAapro Jan 16, 2023
fe10609
fixed tests
JoonasAapro Jan 16, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions decidim-admin/app/views/decidim/admin/moderated_users/index.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
<th><%= t(".name") %></th>
<th><%= t(".nickname") %></th>
<th><%= t(".reason") %></th>
<th><%= sort_link(query, :created_at, t("models.moderation.fields.created_at", scope: "decidim.moderations")) %></th>
<th><%= sort_link(query, :report_count, t(".reports"), default_order: :desc) %></th>
<th class="actions"><%= t(".actions.title") %></th>
</tr>
Expand All @@ -40,6 +41,9 @@
<% reports = moderation.reports.map { |report| render "report", report: report } %>
<%= safe_join(reports, ",") %>
</td>
<td>
<%= l moderation.created_at, format: :decidim_short %>
</td>
<td>
<%= moderation.report_count %>
</td>
Expand Down
2 changes: 1 addition & 1 deletion decidim-admin/config/locales/en.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1102,7 +1102,7 @@ en:
models:
moderation:
fields:
created_at: Creation date
created_at: Reported at
deleted_resource: Deleted resource
hidden_at: Hidden at
participatory_space: Participatory space
Expand Down
2 changes: 1 addition & 1 deletion decidim-admin/config/locales/fi-plain.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1076,7 +1076,7 @@ fi-pl:
models:
moderation:
fields:
created_at: Luonnin ajankohta
created_at: Ilmoituksen ajankohta
alecslupu marked this conversation as resolved.
Show resolved Hide resolved
deleted_resource: Poistettu tietue
hidden_at: Piilotuksen ajankohta
participatory_space: Osallistumistila
Expand Down
2 changes: 1 addition & 1 deletion decidim-admin/config/locales/fi.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1076,7 +1076,7 @@ fi:
models:
moderation:
fields:
created_at: Luonnin ajankohta
created_at: Ilmoituksen ajankohta
alecslupu marked this conversation as resolved.
Show resolved Hide resolved
deleted_resource: Poistettu tietue
hidden_at: Piilotuksen ajankohta
participatory_space: Osallistumistila
Expand Down