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
0a81c000
Commit
0a81c000
authored
Jul 18, 2016
by
Phil Hughes
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed 'no label' being in dropdown toggle label
parent
70d5493e
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
7 deletions
+5
-7
app/assets/javascripts/labels_select.js.coffee
app/assets/javascripts/labels_select.js.coffee
+4
-6
app/views/shared/issuable/_label_dropdown.html.haml
app/views/shared/issuable/_label_dropdown.html.haml
+1
-1
No files found.
app/assets/javascripts/labels_select.js.coffee
View file @
0a81c000
...
@@ -212,7 +212,7 @@ class @LabelsSelect
...
@@ -212,7 +212,7 @@ class @LabelsSelect
$a
=
$
(
'<a href="#">'
)
$a
=
$
(
'<a href="#">'
)
selectedClass
=
[]
selectedClass
=
[]
removesAll
=
label
.
id
is
0
or
not
label
.
id
?
removesAll
=
label
.
id
<=
0
or
not
label
.
id
?
if
$dropdown
.
hasClass
(
'js-filter-bulk-update'
)
if
$dropdown
.
hasClass
(
'js-filter-bulk-update'
)
indeterminate
=
instance
.
indeterminateIds
indeterminate
=
instance
.
indeterminateIds
...
@@ -281,7 +281,7 @@ class @LabelsSelect
...
@@ -281,7 +281,7 @@ class @LabelsSelect
selectedIds
=
$
(
"input[name='
#{
fieldName
}
']"
).
map
(
->
@
value
).
get
()
selectedIds
=
$
(
"input[name='
#{
fieldName
}
']"
).
map
(
->
@
value
).
get
()
selected
=
_
.
filter
glDropdown
.
fullData
,
(
label
)
->
selected
=
_
.
filter
glDropdown
.
fullData
,
(
label
)
->
selectedIds
.
indexOf
(
"
#{
label
[
propertyName
]
}
"
)
>=
0
if
label
[
propertyName
]
?
selectedIds
.
indexOf
(
"
#{
label
[
propertyName
]
}
"
)
>=
0
if
label
[
propertyName
]
?
and
label
.
id
>
0
if
selected
.
length
is
1
if
selected
.
length
is
1
selected
[
0
].
title
selected
[
0
].
title
...
@@ -292,10 +292,8 @@ class @LabelsSelect
...
@@ -292,10 +292,8 @@ class @LabelsSelect
defaultLabel
:
defaultLabel
defaultLabel
:
defaultLabel
fieldName
:
fieldName
fieldName
:
fieldName
id
:
(
label
)
->
id
:
(
label
)
->
return
if
label
.
id
<=
0
if
$dropdown
.
hasClass
(
'js-issuable-form-dropdown'
)
if
$dropdown
.
hasClass
(
'js-issuable-form-dropdown'
)
if
label
.
id
is
0
return
else
return
label
.
id
return
label
.
id
if
$dropdown
.
hasClass
(
"js-filter-submit"
)
and
not
label
.
isAny
?
if
$dropdown
.
hasClass
(
"js-filter-submit"
)
and
not
label
.
isAny
?
...
...
app/views/shared/issuable/_label_dropdown.html.haml
View file @
0a81c000
...
@@ -7,7 +7,7 @@
...
@@ -7,7 +7,7 @@
-
classes
=
local_assigns
.
fetch
(
:classes
,
[])
-
classes
=
local_assigns
.
fetch
(
:classes
,
[])
-
selected
=
local_assigns
.
fetch
(
:selected
,
nil
)
-
selected
=
local_assigns
.
fetch
(
:selected
,
nil
)
-
selected_toggle
=
local_assigns
.
fetch
(
:selected_toggle
,
nil
)
-
selected_toggle
=
local_assigns
.
fetch
(
:selected_toggle
,
nil
)
-
dropdown_data
=
{
toggle:
'dropdown'
,
field_name:
"label_name[]"
,
show_no:
"true"
,
show_any:
"true"
,
selected:
selected
,
project_id:
project
.
try
(
:id
),
labels:
labels_filter_path
,
default_label:
"Label"
}
-
dropdown_data
=
{
toggle:
'dropdown'
,
field_name:
"label_name[]"
,
show_no:
"true"
,
show_any:
"true"
,
selected:
selected
,
project_id:
project
.
try
(
:id
),
labels:
labels_filter_path
,
default_label:
"Label
s
"
}
-
dropdown_data
.
merge!
(
data_options
)
-
dropdown_data
.
merge!
(
data_options
)
-
classes
<<
'js-extra-options'
if
extra_options
-
classes
<<
'js-extra-options'
if
extra_options
-
classes
<<
'js-filter-submit'
if
filter_submit
-
classes
<<
'js-filter-submit'
if
filter_submit
...
...
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