Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
c778921a
Commit
c778921a
authored
Apr 21, 2021
by
Yogi
Committed by
Nicolò Maria Mezzopera
Apr 21, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add gl-badge for badges in admin users nav
parent
9d9b902a
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
14 additions
and
9 deletions
+14
-9
app/views/admin/users/_users.html.haml
app/views/admin/users/_users.html.haml
+9
-9
changelogs/unreleased/gl-badge-admin-users.yml
changelogs/unreleased/gl-badge-admin-users.yml
+5
-0
No files found.
app/views/admin/users/_users.html.haml
View file @
c778921a
...
@@ -7,39 +7,39 @@
...
@@ -7,39 +7,39 @@
=
nav_link
(
html_options:
{
class:
active_when
(
params
[
:filter
].
nil?
)
})
do
=
nav_link
(
html_options:
{
class:
active_when
(
params
[
:filter
].
nil?
)
})
do
=
link_to
admin_users_path
do
=
link_to
admin_users_path
do
=
s_
(
'AdminUsers|Active'
)
=
s_
(
'AdminUsers|Active'
)
%small
.badge.
badge-pill
=
limited_counter_with_delimiter
(
User
.
active_without_ghosts
)
%small
.badge.
gl-tab-counter-badge.badge-muted.badge-pill.gl-badge.sm
=
limited_counter_with_delimiter
(
User
.
active_without_ghosts
)
=
nav_link
(
html_options:
{
class:
active_when
(
params
[
:filter
]
==
'admins'
)
})
do
=
nav_link
(
html_options:
{
class:
active_when
(
params
[
:filter
]
==
'admins'
)
})
do
=
link_to
admin_users_path
(
filter:
"admins"
)
do
=
link_to
admin_users_path
(
filter:
"admins"
)
do
=
s_
(
'AdminUsers|Admins'
)
=
s_
(
'AdminUsers|Admins'
)
%small
.badge.
badge-pill
=
limited_counter_with_delimiter
(
User
.
admins
)
%small
.badge.
gl-tab-counter-badge.badge-muted.badge-pill.gl-badge.sm
=
limited_counter_with_delimiter
(
User
.
admins
)
=
nav_link
(
html_options:
{
class:
"
#{
active_when
(
params
[
:filter
]
==
'two_factor_enabled'
)
}
filter-two-factor-enabled"
})
do
=
nav_link
(
html_options:
{
class:
"
#{
active_when
(
params
[
:filter
]
==
'two_factor_enabled'
)
}
filter-two-factor-enabled"
})
do
=
link_to
admin_users_path
(
filter:
'two_factor_enabled'
)
do
=
link_to
admin_users_path
(
filter:
'two_factor_enabled'
)
do
=
s_
(
'AdminUsers|2FA Enabled'
)
=
s_
(
'AdminUsers|2FA Enabled'
)
%small
.badge.
badge-pill
=
limited_counter_with_delimiter
(
User
.
with_two_factor
)
%small
.badge.
gl-tab-counter-badge.badge-muted.badge-pill.gl-badge.sm
=
limited_counter_with_delimiter
(
User
.
with_two_factor
)
=
nav_link
(
html_options:
{
class:
"
#{
active_when
(
params
[
:filter
]
==
'two_factor_disabled'
)
}
filter-two-factor-disabled"
})
do
=
nav_link
(
html_options:
{
class:
"
#{
active_when
(
params
[
:filter
]
==
'two_factor_disabled'
)
}
filter-two-factor-disabled"
})
do
=
link_to
admin_users_path
(
filter:
'two_factor_disabled'
)
do
=
link_to
admin_users_path
(
filter:
'two_factor_disabled'
)
do
=
s_
(
'AdminUsers|2FA Disabled'
)
=
s_
(
'AdminUsers|2FA Disabled'
)
%small
.badge.
badge-pill
=
limited_counter_with_delimiter
(
User
.
without_two_factor
)
%small
.badge.
gl-tab-counter-badge.badge-muted.badge-pill.gl-badge.sm
=
limited_counter_with_delimiter
(
User
.
without_two_factor
)
=
nav_link
(
html_options:
{
class:
active_when
(
params
[
:filter
]
==
'external'
)
})
do
=
nav_link
(
html_options:
{
class:
active_when
(
params
[
:filter
]
==
'external'
)
})
do
=
link_to
admin_users_path
(
filter:
'external'
)
do
=
link_to
admin_users_path
(
filter:
'external'
)
do
=
s_
(
'AdminUsers|External'
)
=
s_
(
'AdminUsers|External'
)
%small
.badge.
badge-pill
=
limited_counter_with_delimiter
(
User
.
external
)
%small
.badge.
gl-tab-counter-badge.badge-muted.badge-pill.gl-badge.sm
=
limited_counter_with_delimiter
(
User
.
external
)
=
nav_link
(
html_options:
{
class:
active_when
(
params
[
:filter
]
==
'blocked'
)
})
do
=
nav_link
(
html_options:
{
class:
active_when
(
params
[
:filter
]
==
'blocked'
)
})
do
=
link_to
admin_users_path
(
filter:
"blocked"
)
do
=
link_to
admin_users_path
(
filter:
"blocked"
)
do
=
s_
(
'AdminUsers|Blocked'
)
=
s_
(
'AdminUsers|Blocked'
)
%small
.badge.
badge-pill
=
limited_counter_with_delimiter
(
User
.
blocked
)
%small
.badge.
gl-tab-counter-badge.badge-muted.badge-pill.gl-badge.sm
=
limited_counter_with_delimiter
(
User
.
blocked
)
=
nav_link
(
html_options:
{
class:
"
#{
active_when
(
params
[
:filter
]
==
'blocked_pending_approval'
)
}
filter-blocked-pending-approval"
})
do
=
nav_link
(
html_options:
{
class:
"
#{
active_when
(
params
[
:filter
]
==
'blocked_pending_approval'
)
}
filter-blocked-pending-approval"
})
do
=
link_to
admin_users_path
(
filter:
"blocked_pending_approval"
),
data:
{
qa_selector:
'pending_approval_tab'
}
do
=
link_to
admin_users_path
(
filter:
"blocked_pending_approval"
),
data:
{
qa_selector:
'pending_approval_tab'
}
do
=
s_
(
'AdminUsers|Pending approval'
)
=
s_
(
'AdminUsers|Pending approval'
)
%small
.badge.
badge-pill
=
limited_counter_with_delimiter
(
User
.
blocked_pending_approval
)
%small
.badge.
gl-tab-counter-badge.badge-muted.badge-pill.gl-badge.sm
=
limited_counter_with_delimiter
(
User
.
blocked_pending_approval
)
=
nav_link
(
html_options:
{
class:
active_when
(
params
[
:filter
]
==
'deactivated'
)
})
do
=
nav_link
(
html_options:
{
class:
active_when
(
params
[
:filter
]
==
'deactivated'
)
})
do
=
link_to
admin_users_path
(
filter:
"deactivated"
)
do
=
link_to
admin_users_path
(
filter:
"deactivated"
)
do
=
s_
(
'AdminUsers|Deactivated'
)
=
s_
(
'AdminUsers|Deactivated'
)
%small
.badge.
badge-pill
=
limited_counter_with_delimiter
(
User
.
deactivated
)
%small
.badge.
gl-tab-counter-badge.badge-muted.badge-pill.gl-badge.sm
=
limited_counter_with_delimiter
(
User
.
deactivated
)
=
nav_link
(
html_options:
{
class:
active_when
(
params
[
:filter
]
==
'wop'
)
})
do
=
nav_link
(
html_options:
{
class:
active_when
(
params
[
:filter
]
==
'wop'
)
})
do
=
link_to
admin_users_path
(
filter:
"wop"
)
do
=
link_to
admin_users_path
(
filter:
"wop"
)
do
=
s_
(
'AdminUsers|Without projects'
)
=
s_
(
'AdminUsers|Without projects'
)
%small
.badge.
badge-pill
=
limited_counter_with_delimiter
(
User
.
without_projects
)
%small
.badge.
gl-tab-counter-badge.badge-muted.badge-pill.gl-badge.sm
=
limited_counter_with_delimiter
(
User
.
without_projects
)
.nav-controls
.nav-controls
=
render_if_exists
'admin/users/admin_email_users'
=
render_if_exists
'admin/users/admin_email_users'
=
render_if_exists
'admin/users/admin_export_user_permissions'
=
render_if_exists
'admin/users/admin_export_user_permissions'
...
...
changelogs/unreleased/gl-badge-admin-users.yml
0 → 100644
View file @
c778921a
---
title
:
Add gl-badge for badges in admin users nav
merge_request
:
57951
author
:
Yogi (@yo)
type
:
changed
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment