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
2d5c8a59
Commit
2d5c8a59
authored
Jun 09, 2018
by
Robin Naundorf
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix broken breadcrumb in admin/user
* Fix broken breadcrumb when switching tabs in admin/user Closes #47419
parent
923172c9
Changes
8
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
57 additions
and
0 deletions
+57
-0
app/views/admin/identities/edit.html.haml
app/views/admin/identities/edit.html.haml
+3
-0
app/views/admin/identities/index.html.haml
app/views/admin/identities/index.html.haml
+2
-0
app/views/admin/identities/new.html.haml
app/views/admin/identities/new.html.haml
+3
-0
app/views/admin/impersonation_tokens/index.html.haml
app/views/admin/impersonation_tokens/index.html.haml
+2
-0
app/views/admin/users/keys.html.haml
app/views/admin/users/keys.html.haml
+2
-0
app/views/admin/users/projects.html.haml
app/views/admin/users/projects.html.haml
+2
-0
changelogs/unreleased/47419-Fix-breadcrumbs.yml
changelogs/unreleased/47419-Fix-breadcrumbs.yml
+5
-0
spec/features/admin/admin_users_spec.rb
spec/features/admin/admin_users_spec.rb
+38
-0
No files found.
app/views/admin/identities/edit.html.haml
View file @
2d5c8a59
-
add_to_breadcrumbs
"Users"
,
admin_users_path
-
add_to_breadcrumbs
@user
.
name
,
admin_user_identities_path
(
@user
)
-
breadcrumb_title
"Edit Identity"
-
page_title
_
(
"Edit"
),
@identity
.
provider
,
_
(
"Identities"
),
@user
.
name
,
_
(
"Users"
)
%h3
.page-title
=
_
(
'Edit identity for %{user_name}'
)
%
{
user_name:
@user
.
name
}
...
...
app/views/admin/identities/index.html.haml
View file @
2d5c8a59
-
add_to_breadcrumbs
"Users"
,
admin_users_path
-
breadcrumb_title
@user
.
name
-
page_title
_
(
"Identities"
),
@user
.
name
,
_
(
"Users"
)
=
render
'admin/users/head'
...
...
app/views/admin/identities/new.html.haml
View file @
2d5c8a59
-
add_to_breadcrumbs
"Users"
,
admin_users_path
-
add_to_breadcrumbs
@user
.
name
,
admin_user_identities_path
(
@user
)
-
breadcrumb_title
"New Identity"
-
page_title
_
(
"New Identity"
)
%h3
.page-title
=
_
(
'New identity'
)
%hr
...
...
app/views/admin/impersonation_tokens/index.html.haml
View file @
2d5c8a59
-
add_to_breadcrumbs
"Users"
,
admin_users_path
-
breadcrumb_title
@user
.
name
-
page_title
"Impersonation Tokens"
,
@user
.
name
,
"Users"
=
render
'admin/users/head'
...
...
app/views/admin/users/keys.html.haml
View file @
2d5c8a59
-
add_to_breadcrumbs
"Users"
,
admin_users_path
-
breadcrumb_title
@user
.
name
-
page_title
"SSH Keys"
,
@user
.
name
,
"Users"
=
render
'admin/users/head'
=
render
'profiles/keys/key_table'
,
admin:
true
app/views/admin/users/projects.html.haml
View file @
2d5c8a59
-
add_to_breadcrumbs
"Users"
,
admin_users_path
-
breadcrumb_title
@user
.
name
-
page_title
"Groups and projects"
,
@user
.
name
,
"Users"
=
render
'admin/users/head'
...
...
changelogs/unreleased/47419-Fix-breadcrumbs.yml
0 → 100644
View file @
2d5c8a59
---
title
:
Fix breadcrumbs in Admin/User interface.
merge_request
:
19608
author
:
Robin Naundorf
type
:
fixed
spec/features/admin/admin_users_spec.rb
View file @
2d5c8a59
...
...
@@ -315,6 +315,40 @@ describe "Admin::Users" do
end
end
describe
'show breadcrumbs'
do
it
do
visit
admin_user_path
(
user
)
check_breadcrumb
(
user
.
name
)
visit
projects_admin_user_path
(
user
)
check_breadcrumb
(
user
.
name
)
visit
keys_admin_user_path
(
user
)
check_breadcrumb
(
user
.
name
)
visit
admin_user_impersonation_tokens_path
(
user
)
check_breadcrumb
(
user
.
name
)
visit
admin_user_identities_path
(
user
)
check_breadcrumb
(
user
.
name
)
visit
new_admin_user_identity_path
(
user
)
check_breadcrumb
(
"New Identity"
)
visit
admin_user_identities_path
(
user
)
find
(
'.table'
).
find
(
:link
,
'Edit'
).
click
check_breadcrumb
(
"Edit Identity"
)
end
end
describe
'show user attributes'
do
it
do
visit
admin_users_path
...
...
@@ -409,4 +443,8 @@ describe "Admin::Users" do
expect
(
page
).
not_to
have_content
(
'twitter'
)
end
end
def
check_breadcrumb
(
content
)
expect
(
find
(
'.breadcrumbs-sub-title'
)).
to
have_content
(
content
)
end
end
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