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
5266ff93
Commit
5266ff93
authored
Feb 03, 2017
by
Phil Hughes
Committed by
Douglas Barbosa Alexandre
Mar 06, 2017
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Only show dropdown on new & edit milestone
parent
29aec403
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
16 additions
and
9 deletions
+16
-9
app/views/projects/boards/_switcher.html.haml
app/views/projects/boards/_switcher.html.haml
+4
-1
app/views/projects/boards/components/_form.html.haml
app/views/projects/boards/components/_form.html.haml
+12
-8
No files found.
app/views/projects/boards/_switcher.html.haml
View file @
5266ff93
...
@@ -27,7 +27,7 @@
...
@@ -27,7 +27,7 @@
-
if
can?
(
current_user
,
:admin_board
,
@project
)
-
if
can?
(
current_user
,
:admin_board
,
@project
)
%board-selector-form
{
"inline-template"
=>
true
,
%board-selector-form
{
"inline-template"
=>
true
,
":milestone-path"
=>
"milestonePath"
,
":milestone-path"
=>
"milestonePath"
,
"v-if"
=>
"currentPage === 'new' || currentPage === 'edit'"
}
"v-if"
=>
"currentPage === 'new' || currentPage === 'edit'
|| currentPage === 'milestone'
"
}
=
render
"projects/boards/components/form"
=
render
"projects/boards/components/form"
.dropdown-content.board-selector-page-two
{
"v-if"
=>
"currentPage === 'delete'"
}
.dropdown-content.board-selector-page-two
{
"v-if"
=>
"currentPage === 'delete'"
}
%p
%p
...
@@ -49,6 +49,9 @@
...
@@ -49,6 +49,9 @@
%li
%li
%a
{
"href"
=>
"#"
,
"@click.stop.prevent"
=>
"showPage('edit')"
}
%a
{
"href"
=>
"#"
,
"@click.stop.prevent"
=>
"showPage('edit')"
}
Edit board name
Edit board name
%li
%a
{
"href"
=>
"#"
,
"@click.stop.prevent"
=>
"showPage('milestone')"
}
Edit board milestone
%li
{
"v-if"
=>
"showDelete"
}
%li
{
"v-if"
=>
"showDelete"
}
%a
.text-danger
{
"href"
=>
"#"
,
"@click.stop.prevent"
=>
"showPage('delete')"
}
%a
.text-danger
{
"href"
=>
"#"
,
"@click.stop.prevent"
=>
"showPage('delete')"
}
Delete board
Delete board
app/views/projects/boards/components/_form.html.haml
View file @
5266ff93
.dropdown-content.board-selector-page-two
.dropdown-content.board-selector-page-two
%form
{
"@submit.prevent"
=>
"submit"
}
%form
{
"@submit.prevent"
=>
"submit"
}
%label
.label-light
{
for:
"board-new-name"
}
Board name
%input
.form-control
{
type:
"text"
,
id:
"board-new-name"
,
"v-model"
=>
"board.name"
}
%label
.label-light
{
for:
"board-milestone"
}
Board milestone
%input
{
type:
"hidden"
,
%input
{
type:
"hidden"
,
id:
"board-milestone"
,
id:
"board-milestone"
,
"v-model.number"
=>
"board.milestone_id"
}
"v-model.number"
=>
"board.milestone_id"
}
.dropdown
{
":class"
=>
"{ open: milestoneDropdownOpen }"
}
%div
{
"v-if"
=>
"currentPage !== 'milestone'"
}
%label
.label-light
{
for:
"board-new-name"
}
Board name
%input
.form-control
{
type:
"text"
,
id:
"board-new-name"
,
"v-model"
=>
"board.name"
}
.dropdown
{
":class"
=>
"{ open: milestoneDropdownOpen }"
,
"v-if"
=>
"currentPage !== 'edit'"
}
%label
.label-light
{
for:
"board-milestone"
}
Board milestone
%button
.dropdown-menu-toggle.wide
{
type:
"button"
,
%button
.dropdown-menu-toggle.wide
{
type:
"button"
,
"@click.stop.prevent"
=>
"loadMilestones"
}
"@click.stop.prevent"
=>
"loadMilestones"
}
{{ milestoneToggleText }}
{{ milestoneToggleText }}
...
@@ -24,6 +26,8 @@
...
@@ -24,6 +26,8 @@
"@click.stop.prevent"
=>
"selectMilestone(milestone)"
}
"@click.stop.prevent"
=>
"selectMilestone(milestone)"
}
{{ milestone.title }}
{{ milestone.title }}
=
dropdown_loading
=
dropdown_loading
%span
Only show issues scheduled for the selected milestone
.clearfix.prepend-top-10
.clearfix.prepend-top-10
%button
.btn.btn-primary.pull-left
{
type:
"submit"
,
%button
.btn.btn-primary.pull-left
{
type:
"submit"
,
":disabled"
=>
"board.name === ''"
,
":disabled"
=>
"board.name === ''"
,
...
...
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