nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove links to deleted profiles in admin user stats

Browse source 
closes #8063
closes #8061
This commit is contained in:
Vitalie Ciubotaru 2019-10-01 23:47:03 +09:00 committed by Jonne Haß
parent ba8e0907cc
commit 827a2ce991
3 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Changelog.md
View file

@ -3,6 +3,7 @@
## Refactor ## Refactor
## Bug fixes ## Bug fixes
* Don't link to deleted users in admin user stats [#8063](https://github.com/diaspora/diaspora/pull/8063)
## Features ## Features

2
app/controllers/admins_controller.rb
View file

@ -43,7 +43,7 @@ class AdminsController < Admin::AdminController
@created_users = User.where("username IS NOT NULL and created_at IS NOT NULL") @created_users = User.where("username IS NOT NULL and created_at IS NOT NULL")
@created_users.find_each do |u| @created_users.find_each do |u|
week = u.created_at.beginning_of_week.strftime("%Y-%m-%d") week = u.created_at.beginning_of_week.strftime("%Y-%m-%d")
@created_users_by_week[week] << u.username @created_users_by_week[week] << {username: u.username, closed_account: u.person.closed_account}
end end
@selected_week = params[:week] || @created_users_by_week.keys.last @selected_week = params[:week] || @created_users_by_week.keys.last

6
app/views/admins/_weekly_user_stats.haml
View file

@ -18,4 +18,8 @@
= t(".amount_of", count: counter) = t(".amount_of", count: counter)
%br %br
- created_users_by_week[selected_week].each do |m| - created_users_by_week[selected_week].each do |m|
= link_to m, "/u/#{m}" - if m[:closed_account]
%s
= m[:username]
- else
= link_to m[:username], "/u/#{m[:username]}"