ar
/
mastodon
forked from treehouse/mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Change how unconfirmed accounts are displayed in admin UI (#17874) 

Fix #17815
rebase/4.0.0rc2
Eugen Rochko 2022-03-26 02:53:13 +01:00 committed by GitHub
parent 52813830be
commit 2dd30804b6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/models/account.rb
View File

@ -128,13 +128,13 @@ class Account < ApplicationRecord
:approved?, :approved?,
:pending?, :pending?,
:disabled?, :disabled?,
:unconfirmed?,
:unconfirmed_or_pending?, :unconfirmed_or_pending?,
:role, :role,
:admin?, :admin?,
:moderator?, :moderator?,
:staff?, :staff?,
:locale, :locale,
:hides_network?,
:shows_application?, :shows_application?,
to: :user, to: :user,
prefix: true, prefix: true,

6
app/models/user.rb
View File

@ -208,8 +208,12 @@ class User < ApplicationRecord
confirmed? && approved? && !disabled? && !account.suspended? && !account.memorial? && account.moved_to_account_id.nil? confirmed? && approved? && !disabled? && !account.suspended? && !account.memorial? && account.moved_to_account_id.nil?
end end
def unconfirmed?
!confirmed?
end
def unconfirmed_or_pending? def unconfirmed_or_pending?
!(confirmed? && approved?) unconfirmed? || pending?
end end
def inactive_message def inactive_message

2
app/views/admin/accounts/_account.html.haml
View File

@ -1,4 +1,4 @@
.batch-table__row{ class: [!account.suspended? && account.user_pending? && 'batch-table__row--attention', account.suspended? && 'batch-table__row--muted'] } .batch-table__row{ class: [!account.suspended? && account.user_pending? && 'batch-table__row--attention', (account.suspended? || account.user_unconfirmed?) && 'batch-table__row--muted'] }
%label.batch-table__row__select.batch-table__row__select--aligned.batch-checkbox %label.batch-table__row__select.batch-table__row__select--aligned.batch-checkbox
= f.check_box :account_ids, { multiple: true, include_hidden: false }, account.id = f.check_box :account_ids, { multiple: true, include_hidden: false }, account.id
.batch-table__row__content.batch-table__row__content--unpadded .batch-table__row__content.batch-table__row__content--unpadded