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
db3266f7
Commit
db3266f7
authored
Oct 10, 2017
by
Simon Knox
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix default weight selection display
parent
20d43709
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
4 deletions
+9
-4
app/assets/javascripts/boards/components/weight_select.vue
app/assets/javascripts/boards/components/weight_select.vue
+8
-4
app/assets/javascripts/weight_select.js
app/assets/javascripts/weight_select.js
+1
-0
No files found.
app/assets/javascripts/boards/components/weight_select.vue
View file @
db3266f7
...
@@ -51,14 +51,17 @@ export default {
...
@@ -51,14 +51,17 @@ export default {
},
},
methods
:
{
methods
:
{
selectWeight
(
weight
)
{
selectWeight
(
weight
)
{
this
.
board
.
weight
=
this
.
weightInt
(
weight
);
},
weightInt
(
weight
)
{
if
(
weight
===
ANY_WEIGHT
)
{
if
(
weight
===
ANY_WEIGHT
)
{
weight
=
-
1
;
return
-
1
;
}
}
if
(
weight
===
NO_WEIGHT
)
{
if
(
weight
===
NO_WEIGHT
)
{
weight
=
0
;
return
0
;
}
}
this
.
$set
(
this
.
board
,
'
weight
'
,
weight
);
return
weight
}
,
}
},
},
mounted
()
{
mounted
()
{
new
WeightSelect
(
this
.
$refs
.
dropdownButton
,
{
new
WeightSelect
(
this
.
$refs
.
dropdownButton
,
{
...
@@ -121,6 +124,7 @@ export default {
...
@@ -121,6 +124,7 @@ export default {
:key=
"weight"
:key=
"weight"
>
>
<a
<a
:class=
"
{'is-active': weightInt(weight) == value}"
:data-id="weight"
:data-id="weight"
href="#"
href="#"
>
>
...
...
app/assets/javascripts/weight_select.js
View file @
db3266f7
...
@@ -66,6 +66,7 @@
...
@@ -66,6 +66,7 @@
clicked
:
function
(
glDropdownEvt
)
{
clicked
:
function
(
glDropdownEvt
)
{
const
e
=
glDropdownEvt
.
e
;
const
e
=
glDropdownEvt
.
e
;
let
selected
=
glDropdownEvt
.
selectedObj
;
let
selected
=
glDropdownEvt
.
selectedObj
;
const
inputField
=
$dropdown
.
closest
(
'
.selectbox
'
).
find
(
`input[name='
${
fieldName
}
']`
);
if
(
options
.
handleClick
)
{
if
(
options
.
handleClick
)
{
e
.
preventDefault
();
e
.
preventDefault
();
...
...
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