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
ea181f70
Commit
ea181f70
authored
Oct 11, 2017
by
Simon Knox
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix lint
parent
7b93b8ae
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
16 additions
and
17 deletions
+16
-17
app/assets/javascripts/boards/components/board_form.vue
app/assets/javascripts/boards/components/board_form.vue
+4
-4
app/assets/javascripts/boards/components/labels_select.vue
app/assets/javascripts/boards/components/labels_select.vue
+3
-3
app/assets/javascripts/boards/components/milestone_select.vue
...assets/javascripts/boards/components/milestone_select.vue
+3
-3
app/assets/javascripts/boards/components/user_select.vue
app/assets/javascripts/boards/components/user_select.vue
+1
-1
app/assets/javascripts/boards/components/weight_select.vue
app/assets/javascripts/boards/components/weight_select.vue
+5
-6
No files found.
app/assets/javascripts/boards/components/board_form.vue
View file @
ea181f70
<
script
>
<
script
>
/* global BoardService */
/* global BoardService */
/* global Flash */
import
Vue
from
'
vue
'
;
import
PopupDialog
from
'
~/vue_shared/components/popup_dialog.vue
'
;
import
PopupDialog
from
'
~/vue_shared/components/popup_dialog.vue
'
;
import
BoardMilestoneSelect
from
'
./milestone_select.vue
'
;
import
BoardMilestoneSelect
from
'
./milestone_select.vue
'
;
import
BoardWeightSelect
from
'
./weight_select.vue
'
;
import
BoardWeightSelect
from
'
./weight_select.vue
'
;
...
@@ -120,7 +120,7 @@ export default {
...
@@ -120,7 +120,7 @@ export default {
},
},
weightsArray
()
{
weightsArray
()
{
return
JSON
.
parse
(
this
.
weights
);
return
JSON
.
parse
(
this
.
weights
);
}
}
,
},
},
methods
:
{
methods
:
{
submit
()
{
submit
()
{
...
@@ -131,7 +131,7 @@ export default {
...
@@ -131,7 +131,7 @@ export default {
gl
.
utils
.
visitUrl
(
Store
.
rootPath
);
gl
.
utils
.
visitUrl
(
Store
.
rootPath
);
})
})
.
catch
(()
=>
{
.
catch
(()
=>
{
Flash
(
'
Failed to delete board. Please try again.
'
)
Flash
(
'
Failed to delete board. Please try again.
'
)
;
this
.
submitDisabled
=
false
;
this
.
submitDisabled
=
false
;
});
});
}
else
{
}
else
{
...
@@ -141,7 +141,7 @@ export default {
...
@@ -141,7 +141,7 @@ export default {
gl
.
utils
.
visitUrl
(
`
${
Store
.
rootPath
}
/
${
data
.
id
}
`
);
gl
.
utils
.
visitUrl
(
`
${
Store
.
rootPath
}
/
${
data
.
id
}
`
);
})
})
.
catch
(()
=>
{
.
catch
(()
=>
{
Flash
(
'
Unable to save your changes. Please try again.
'
)
Flash
(
'
Unable to save your changes. Please try again.
'
)
;
});
});
}
}
},
},
...
...
app/assets/javascripts/boards/components/labels_select.vue
View file @
ea181f70
<
script
>
<
script
>
/* global LabelsSelect */
/* global LabelsSelect */
/* global ListLabel */
import
loadingIcon
from
'
~/vue_shared/components/loading_icon.vue
'
;
import
loadingIcon
from
'
~/vue_shared/components/loading_icon.vue
'
;
import
eventHub
from
'
../eventhub
'
;
export
default
{
export
default
{
props
:
{
props
:
{
...
@@ -32,7 +32,7 @@ export default {
...
@@ -32,7 +32,7 @@ export default {
},
},
},
},
mounted
()
{
mounted
()
{
new
LabelsSelect
(
this
.
$refs
.
dropdownButton
,
{
this
.
labelsDropdown
=
new
LabelsSelect
(
this
.
$refs
.
dropdownButton
,
{
handleClick
:
this
.
handleClick
,
handleClick
:
this
.
handleClick
,
});
});
},
},
...
@@ -58,7 +58,7 @@ export default {
...
@@ -58,7 +58,7 @@ export default {
labels
=
labels
.
filter
(
selected
=>
selected
.
id
!==
label
.
id
);
labels
=
labels
.
filter
(
selected
=>
selected
.
id
!==
label
.
id
);
this
.
board
.
labels
=
labels
;
this
.
board
.
labels
=
labels
;
}
}
}
}
,
},
},
};
};
</
script
>
</
script
>
...
...
app/assets/javascripts/boards/components/milestone_select.vue
View file @
ea181f70
...
@@ -37,12 +37,12 @@ export default {
...
@@ -37,12 +37,12 @@ export default {
return
this
.
board
.
milestone_id
;
return
this
.
board
.
milestone_id
;
},
},
milestoneTitleClass
()
{
milestoneTitleClass
()
{
return
this
.
milestoneTitle
===
ANY_MILESTONE
?
'
text-secondary
'
:
'
bold
'
;
return
this
.
milestoneTitle
===
ANY_MILESTONE
?
'
text-secondary
'
:
'
bold
'
;
},
},
selected
()
{
selected
()
{
if
(
this
.
noMilestone
)
return
NO_MILESTONE
;
if
(
this
.
noMilestone
)
return
NO_MILESTONE
;
return
this
.
board
.
milestone
?
this
.
board
.
milestone
.
name
:
''
;
return
this
.
board
.
milestone
?
this
.
board
.
milestone
.
name
:
''
;
}
}
,
},
},
methods
:
{
methods
:
{
selectMilestone
(
milestone
)
{
selectMilestone
(
milestone
)
{
...
@@ -60,7 +60,7 @@ export default {
...
@@ -60,7 +60,7 @@ export default {
},
},
},
},
mounted
()
{
mounted
()
{
new
MilestoneSelect
(
null
,
this
.
$refs
.
dropdownButton
,
{
this
.
milestoneDropdown
=
new
MilestoneSelect
(
null
,
this
.
$refs
.
dropdownButton
,
{
handleClick
:
this
.
selectMilestone
,
handleClick
:
this
.
selectMilestone
,
});
});
},
},
...
...
app/assets/javascripts/boards/components/user_select.vue
View file @
ea181f70
...
@@ -69,7 +69,7 @@ export default {
...
@@ -69,7 +69,7 @@ export default {
},
},
methods
:
{
methods
:
{
initSelect
()
{
initSelect
()
{
new
UsersSelect
(
null
,
this
.
$refs
.
dropdown
,
{
this
.
userDropdown
=
new
UsersSelect
(
null
,
this
.
$refs
.
dropdown
,
{
handleClick
:
this
.
selectUser
,
handleClick
:
this
.
selectUser
,
});
});
},
},
...
...
app/assets/javascripts/boards/components/weight_select.vue
View file @
ea181f70
...
@@ -3,7 +3,6 @@
...
@@ -3,7 +3,6 @@
import
'
~/weight_select
'
;
import
'
~/weight_select
'
;
import
loadingIcon
from
'
~/vue_shared/components/loading_icon.vue
'
;
import
loadingIcon
from
'
~/vue_shared/components/loading_icon.vue
'
;
import
eventHub
from
'
../eventhub
'
;
const
ANY_WEIGHT
=
'
Any Weight
'
;
const
ANY_WEIGHT
=
'
Any Weight
'
;
const
NO_WEIGHT
=
'
No Weight
'
;
const
NO_WEIGHT
=
'
No Weight
'
;
...
@@ -45,9 +44,9 @@ export default {
...
@@ -45,9 +44,9 @@ export default {
},
},
valueText
()
{
valueText
()
{
if
(
this
.
value
>
0
)
return
this
.
value
;
if
(
this
.
value
>
0
)
return
this
.
value
;
if
(
this
.
value
==
0
)
return
NO_WEIGHT
;
if
(
this
.
value
==
=
0
)
return
NO_WEIGHT
;
return
ANY_WEIGHT
;
return
ANY_WEIGHT
;
}
}
,
},
},
methods
:
{
methods
:
{
selectWeight
(
weight
)
{
selectWeight
(
weight
)
{
...
@@ -61,15 +60,15 @@ export default {
...
@@ -61,15 +60,15 @@ export default {
return
0
;
return
0
;
}
}
return
-
1
;
return
-
1
;
}
}
,
},
},
mounted
()
{
mounted
()
{
new
WeightSelect
(
this
.
$refs
.
dropdownButton
,
{
this
.
weightDropdown
=
new
WeightSelect
(
this
.
$refs
.
dropdownButton
,
{
handleClick
:
this
.
selectWeight
,
handleClick
:
this
.
selectWeight
,
selected
:
this
.
value
,
selected
:
this
.
value
,
fieldName
:
this
.
fieldName
,
fieldName
:
this
.
fieldName
,
});
});
}
}
,
};
};
</
script
>
</
script
>
...
...
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