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
49f00620
Commit
49f00620
authored
Aug 06, 2020
by
peterhegman
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Move search field into a partial
parent
860eb7af
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
7 deletions
+8
-7
app/views/groups/group_members/index.html.haml
app/views/groups/group_members/index.html.haml
+2
-7
app/views/shared/members/_search_field.html.haml
app/views/shared/members/_search_field.html.haml
+6
-0
No files found.
app/views/groups/group_members/index.html.haml
View file @
49f00620
...
...
@@ -56,9 +56,7 @@
=
form_tag
group_group_members_path
(
@group
),
method: :get
,
class:
'user-search-form gl-display-flex gl-md-align-items-center gl-flex-wrap gl-flex-direction-column gl-md-flex-direction-row gl-mx-n3 gl-my-n3'
do
.gl-px-3.gl-py-2
.search-control-wrap.gl-relative
=
search_field_tag
:search
,
params
[
:search
],
{
placeholder:
_
(
'Search'
),
class:
'form-control'
,
spellcheck:
false
}
%button
.user-search-btn.border-left.gl-display-flex.gl-align-items-center.gl-justify-content-center
{
type:
"submit"
,
"aria-label"
:
_
(
"Submit search"
)
}
=
sprite_icon
(
"search"
)
=
render
'shared/members/search_field'
-
if
can_manage_members
.gl-px-3.gl-py-3.gl-display-flex.gl-flex-direction-column.gl-md-flex-direction-row
=
label_tag
'2fa'
,
_
(
'2FA'
),
class:
'label-bold gl-mr-2 gl-mb-0 gl-py-2 align-self-md-center'
...
...
@@ -86,10 +84,7 @@
%span
.gl-flex-grow-1.gl-md-align-self-center.gl-py-3
=
html_escape
(
_
(
"Members with pending access to %{strong_start}%{group_name}%{strong_end}"
))
%
{
group_name:
@group
.
name
,
strong_start:
'<strong>'
.
html_safe
,
strong_end:
'</strong>'
.
html_safe
}
=
form_tag
group_group_members_path
(
@group
),
method: :get
,
class:
'user-search-form'
do
.search-control-wrap.gl-relative
=
search_field_tag
:search_invited
,
params
[
:search_invited
],
{
placeholder:
_
(
'Search'
),
class:
'form-control'
,
spellcheck:
false
}
%button
.user-search-btn.border-left.gl-display-flex.gl-align-items-center.gl-justify-content-center
{
type:
"submit"
,
"aria-label"
:
_
(
"Submit search"
)
}
=
sprite_icon
(
"search"
)
=
render
'shared/members/search_field'
,
name:
'search_invited'
%ul
.content-list.members-list
=
render
partial:
'shared/members/member'
,
collection:
@invited_members
,
as: :member
=
paginate
@invited_members
,
param_name:
'invited_members_page'
,
theme:
'gitlab'
,
params:
{
page:
nil
}
...
...
app/views/shared/members/_search_field.html.haml
0 → 100644
View file @
49f00620
-
name
=
local_assigns
.
fetch
(
:name
,
:search
)
.search-control-wrap.gl-relative
=
search_field_tag
name
,
params
[
name
],
{
placeholder:
_
(
'Search'
),
class:
'form-control'
,
spellcheck:
false
}
%button
.user-search-btn.border-left.gl-display-flex.gl-align-items-center.gl-justify-content-center
{
type:
"submit"
,
"aria-label"
:
_
(
"Submit search"
)
}
=
sprite_icon
(
"search"
)
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