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
c7e62a3e
Commit
c7e62a3e
authored
May 02, 2017
by
Clement Ho
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[skip ci] fix bug where checkmark would not show up on selected user dropdown
parent
8bf5936d
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
15 additions
and
5 deletions
+15
-5
app/assets/javascripts/users_select.js
app/assets/javascripts/users_select.js
+10
-5
spec/features/dashboard/issues_spec.rb
spec/features/dashboard/issues_spec.rb
+5
-0
No files found.
app/assets/javascripts/users_select.js
View file @
c7e62a3e
...
...
@@ -363,15 +363,20 @@ import eventHub from './sidebar/event_hub';
},
updateLabel
:
$dropdown
.
data
(
'
dropdown-title
'
),
renderRow
:
function
(
user
)
{
var
avatar
,
img
,
listClosingTags
,
listWithName
,
listWithUserName
,
selected
,
username
;
var
avatar
,
img
,
listClosingTags
,
listWithName
,
listWithUserName
,
username
;
username
=
user
.
username
?
"
@
"
+
user
.
username
:
""
;
avatar
=
user
.
avatar_url
?
user
.
avatar_url
:
false
;
let
selected
=
user
.
id
===
parseInt
(
selectedId
,
10
);
if
(
this
.
multiSelect
)
{
const
fieldName
=
this
.
fieldName
;
const
field
=
$dropdown
.
closest
(
'
.selectbox
'
).
find
(
"
input[name='
"
+
fieldName
+
"
'][value='
"
+
user
.
id
+
"
']
"
);
if
(
field
.
length
)
{
selected
=
true
;
}
}
img
=
""
;
if
(
user
.
beforeDivider
!=
null
)
{
...
...
spec/features/dashboard/issues_spec.rb
View file @
c7e62a3e
...
...
@@ -30,6 +30,11 @@ RSpec.describe 'Dashboard Issues', feature: true do
find
(
'#assignee_id'
,
visible:
false
).
set
(
''
)
find
(
'.js-author-search'
,
match: :first
).
click
find
(
'.dropdown-menu-author li a'
,
match: :first
,
text:
current_user
.
to_reference
).
click
find
(
'.js-author-search'
,
match: :first
).
click
page
.
within
'.dropdown-menu-user'
do
expect
(
find
(
'.dropdown-menu-author li a.is-active'
,
match: :first
,
text:
current_user
.
to_reference
)).
to
be_visible
end
expect
(
page
).
to
have_content
(
authored_issue
.
title
)
expect
(
page
).
to
have_content
(
authored_issue_on_public_project
.
title
)
...
...
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