Skip to content

Commit 7d3540c

Browse files
Manage Users UI changes (#6057)
* Manage Users UI changes - changed the subtext for the unverified users `EmptyUsersList` and changed the banned users list to use its corresponding one - `unverified` method in `admin/users_controller doesn't check for an avatar * esl fix --------- Co-authored-by: Ahmad Farhat <ahmad.af.farhat@gmail.com>
1 parent 600584a commit 7d3540c

File tree

3 files changed

+8
-4
lines changed

3 files changed

+8
-4
lines changed

app/assets/locales/en.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -233,7 +233,7 @@
233233
"empty_banned_users": "There are no banned users on this server yet!",
234234
"empty_banned_users_subtext": "When a user's status gets changed to banned, they will appear here.",
235235
"empty_unverified_users": "There are no unverified users on this server yet!",
236-
"empty_unverified_users_subtext": "When a user's status gets changed to unverified, they will appear here.",
236+
"empty_unverified_users_subtext": "Any unverified users will appear here.",
237237
"empty_invited_users": "There are no invited users on this server yet!",
238238
"empty_invited_users_subtext": "When a user's status gets changed to invited, they will appear here.",
239239
"invited": {

app/controllers/api/v1/admin/users_controller.rb

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,6 @@ def unverified
7474
users = User.includes(:role)
7575
.with_provider(current_provider)
7676
.where(verified: false)
77-
.with_attached_avatar
7877
.order(sort_config, created_at: :desc)&.search(params[:search])
7978

8079
pagy, users = pagy(users)

app/javascript/components/admin/manage_users/BannedPendingUsersTable.jsx

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,15 @@ export default function BannedPendingUsersTable({
3333
return <EmptyUsersList text={t('admin.manage_users.empty_pending_users')} subtext={t('admin.manage_users.empty_pending_users_subtext')} />;
3434
}
3535
if (tableType === 'unverified') {
36-
return <EmptyUsersList text={t('admin.manage_users.empty_pending_users')} subtext={t('admin.manage_users.empty_unverified_users_subtext')} />;
36+
return (
37+
<EmptyUsersList
38+
text={t('admin.manage_users.empty_unverified_users')}
39+
subtext={t('admin.manage_users.empty_unverified_users_subtext')}
40+
/>
41+
);
3742
}
3843

39-
return <EmptyUsersList text={t('admin.manage_users.empty_pending_users')} subtext={t('admin.manage_users.empty_banned_users_subtext')} />;
44+
return <EmptyUsersList text={t('admin.manage_users.empty_banned_users')} subtext={t('admin.manage_users.empty_banned_users_subtext')} />;
4045
}
4146

4247
return (

0 commit comments

Comments
 (0)