diff --git a/Changelog.md b/Changelog.md index 61bf06894..4e39c99c0 100644 --- a/Changelog.md +++ b/Changelog.md @@ -3,6 +3,7 @@ ## Refactor ## Bug fixes +* Don't link to deleted users in admin user stats [#8063](https://github.com/diaspora/diaspora/pull/8063) ## Features diff --git a/app/controllers/admins_controller.rb b/app/controllers/admins_controller.rb index daad7c46f..3d00ff6e9 100644 --- a/app/controllers/admins_controller.rb +++ b/app/controllers/admins_controller.rb @@ -43,7 +43,7 @@ class AdminsController < Admin::AdminController @created_users = User.where("username IS NOT NULL and created_at IS NOT NULL") @created_users.find_each do |u| 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 @selected_week = params[:week] || @created_users_by_week.keys.last diff --git a/app/views/admins/_weekly_user_stats.haml b/app/views/admins/_weekly_user_stats.haml index a3a9eff07..51e8981d2 100644 --- a/app/views/admins/_weekly_user_stats.haml +++ b/app/views/admins/_weekly_user_stats.haml @@ -18,4 +18,8 @@ = t(".amount_of", count: counter) %br - 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]}"