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
33398e04
Commit
33398e04
authored
Oct 06, 2017
by
Simon Knox
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
clean up unused params
parent
53aaf806
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
111 additions
and
124 deletions
+111
-124
app/assets/javascripts/boards/components/board_form.vue
app/assets/javascripts/boards/components/board_form.vue
+110
-114
app/assets/javascripts/boards/components/boards_selector.js
app/assets/javascripts/boards/components/boards_selector.js
+0
-1
app/assets/javascripts/boards/components/labels_select.vue
app/assets/javascripts/boards/components/labels_select.vue
+1
-1
app/assets/javascripts/boards/components/milestone_select.vue
...assets/javascripts/boards/components/milestone_select.vue
+0
-4
app/assets/javascripts/boards/components/weight_select.vue
app/assets/javascripts/boards/components/weight_select.vue
+0
-4
No files found.
app/assets/javascripts/boards/components/board_form.vue
View file @
33398e04
<
template
>
<popup-dialog
v-show=
"currentPage"
:title=
"title"
:primary-button-label=
"buttonText"
:kind=
"buttonKind"
:submit-disabled=
"submitDisabled"
@
toggle=
"cancel"
@
submit=
"submit"
>
<p
v-if=
"isDeleteForm"
>
Are you sure you want to delete this board?
</p>
<form
v-else
class=
"js-board-config-modal"
>
<div
v-if=
"!readonly"
class=
"append-bottom-20"
>
<label
class=
"form-section-title label-light"
for=
"board-new-name"
>
Board name
</label>
<input
ref=
"name"
class=
"form-control"
type=
"text"
id=
"board-new-name"
v-model=
"board.name"
placeholder=
"Enter board name"
>
</div>
<div
v-if=
"scopedIssueBoardFeatureEnabled"
>
<div
v-if=
"canAdminBoard"
class=
"media append-bottom-10"
>
<label
class=
"form-section-title label-light media-body"
>
Board scope
</label>
<button
type=
"button"
class=
"btn"
@
click=
"expanded = !expanded"
v-if=
"collapseScope"
>
{{
expandButtonText
}}
</button>
</div>
<p
class=
"text-secondary append-bottom-10"
>
Board scope affects which issues are displayed for anyone who visits this board
</p>
<div
v-if=
"!collapseScope || expanded"
>
<div
class=
"list-item"
>
<board-milestone-select
:board=
"board"
:milestone-path=
"milestonePath"
title=
"Milestone"
default-text=
"Any milestone"
:can-edit=
"canAdminBoard"
/>
</div>
<div
class=
"list-item"
>
<board-labels-select
:board=
"board"
:selected=
"board.labels"
title=
"Labels"
default-text=
"Any label"
:can-edit=
"canAdminBoard"
:labels-path=
"labelsPath"
/>
</div>
<div
class=
"list-item"
>
<user-select
any-user-text=
"Any assignee"
:board=
"board"
field-name=
"assignee_id"
label=
"Assignee"
v-model=
"board.assignee_id"
:selected=
"board.assignee"
:can-edit=
"canAdminBoard"
placeholder-text=
"Select assignee"
:project-id=
"projectId"
:group-id=
"groupId"
wrapper-class=
"assignee"
/>
</div>
<div
class=
"list-item"
>
<board-weight-select
:board=
"board"
:weights=
"weightsArray"
v-model=
"board.weight"
title=
"Weight"
default-text=
"Any weight"
:can-edit=
"canAdminBoard"
/>
</div>
</div>
</div>
</form>
<div
slot=
"footer"
v-if=
"readonly"
></div>
</popup-dialog>
</
template
>
<
script
>
/* global BoardService */
...
...
@@ -288,3 +174,113 @@ export default Vue.extend({
},
});
</
script
>
<
template
>
<popup-dialog
v-show=
"currentPage"
:title=
"title"
:primary-button-label=
"buttonText"
:kind=
"buttonKind"
:submit-disabled=
"submitDisabled"
@
toggle=
"cancel"
@
submit=
"submit"
>
<p
v-if=
"isDeleteForm"
>
Are you sure you want to delete this board?
</p>
<form
v-else
class=
"js-board-config-modal"
>
<div
v-if=
"!readonly"
class=
"append-bottom-20"
>
<label
class=
"form-section-title label-light"
for=
"board-new-name"
>
Board name
</label>
<input
ref=
"name"
class=
"form-control"
type=
"text"
id=
"board-new-name"
v-model=
"board.name"
placeholder=
"Enter board name"
>
</div>
<div
v-if=
"scopedIssueBoardFeatureEnabled"
>
<div
v-if=
"canAdminBoard"
class=
"media append-bottom-10"
>
<label
class=
"form-section-title label-light media-body"
>
Board scope
</label>
<button
type=
"button"
class=
"btn"
@
click=
"expanded = !expanded"
v-if=
"collapseScope"
>
{{
expandButtonText
}}
</button>
</div>
<p
class=
"text-secondary append-bottom-10"
>
Board scope affects which issues are displayed for anyone who visits this board
</p>
<div
v-if=
"!collapseScope || expanded"
>
<div
class=
"list-item"
>
<board-milestone-select
:board=
"board"
:milestone-path=
"milestonePath"
title=
"Milestone"
:can-edit=
"canAdminBoard"
/>
</div>
<div
class=
"list-item"
>
<board-labels-select
:board=
"board"
:selected=
"board.labels"
title=
"Labels"
:can-edit=
"canAdminBoard"
:labels-path=
"labelsPath"
/>
</div>
<div
class=
"list-item"
>
<user-select
any-user-text=
"Any assignee"
:board=
"board"
field-name=
"assignee_id"
label=
"Assignee"
:selected=
"board.assignee"
:can-edit=
"canAdminBoard"
placeholder-text=
"Select assignee"
:project-id=
"projectId"
:group-id=
"groupId"
wrapper-class=
"assignee"
/>
</div>
<div
class=
"list-item"
>
<board-weight-select
:board=
"board"
:weights=
"weightsArray"
v-model=
"board.weight"
title=
"Weight"
:can-edit=
"canAdminBoard"
/>
</div>
</div>
</div>
</form>
<div
slot=
"footer"
v-if=
"readonly"
></div>
</popup-dialog>
</
template
>
app/assets/javascripts/boards/components/boards_selector.js
View file @
33398e04
...
...
@@ -29,7 +29,6 @@ import BoardForm from './board_form.vue';
loading
:
true
,
boards
:
[],
state
:
Store
.
state
,
milestoneTitle
:
'
Milestone
'
,
};
},
watch
:
{
...
...
app/assets/javascripts/boards/components/labels_select.vue
View file @
33398e04
...
...
@@ -100,7 +100,7 @@ export default {
>
<div
class=
"dropdown"
>
<button
v-bind
:data-labels=
"labelsPath"
:data-labels=
"labelsPath"
class=
"dropdown-menu-toggle wide js-label-select js-multiselect js-extra-options js-board-config-modal"
data-field-name=
"label_id[]"
:data-show-any=
"true"
...
...
app/assets/javascripts/boards/components/milestone_select.vue
View file @
33398e04
...
...
@@ -16,10 +16,6 @@ export default {
type
:
String
,
required
:
true
,
},
defaultText
:
{
type
:
String
,
required
:
true
,
},
title
:
{
type
:
String
,
required
:
true
,
...
...
app/assets/javascripts/boards/components/weight_select.vue
View file @
33398e04
...
...
@@ -17,10 +17,6 @@ export default {
type
:
[
Number
,
String
],
required
:
false
,
},
defaultText
:
{
type
:
String
,
required
:
true
,
},
title
:
{
type
:
String
,
required
:
true
,
...
...
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