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
0
Merge Requests
0
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
Jérome Perrin
gitlab-ce
Commits
5c7fd643
Commit
5c7fd643
authored
8 years ago
by
Phil Hughes
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed blank state nevermind button
parent
a996eecc
No related merge requests found
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
6 additions
and
7 deletions
+6
-7
app/assets/javascripts/boards/components/board_blank_state.js.es6
...ts/javascripts/boards/components/board_blank_state.js.es6
+1
-2
app/assets/javascripts/boards/stores/boards_store.js.es6
app/assets/javascripts/boards/stores/boards_store.js.es6
+1
-1
app/views/projects/boards/components/_blank_state.html.haml
app/views/projects/boards/components/_blank_state.html.haml
+2
-2
app/views/projects/boards/components/_board.html.haml
app/views/projects/boards/components/_board.html.haml
+1
-1
spec/features/boards/boards_spec.rb
spec/features/boards/boards_spec.rb
+1
-1
No files found.
app/assets/javascripts/boards/components/board_blank_state.js.es6
View file @
5c7fd643
...
...
@@ -11,8 +11,7 @@
}
},
methods: {
addDefaultLists (e) {
e.stopImmediatePropagation();
addDefaultLists () {
BoardsStore.removeBlankState();
for (let i = 0, labelsLength = this.predefinedLabels.length; i < labelsLength; i++) {
...
...
This diff is collapsed.
Click to expand it.
app/assets/javascripts/boards/stores/boards_store.js.es6
View file @
5c7fd643
...
...
@@ -65,7 +65,7 @@
return $.cookie('issue_board_welcome_hidden') === 'true';
},
removeList (id) {
const list = this.findList('id', id);
const list = this.findList('id', id
, 'blank'
);
if (!list) return;
...
...
This diff is collapsed.
Click to expand it.
app/views/projects/boards/components/_blank_state.html.haml
View file @
5c7fd643
...
...
@@ -9,7 +9,7 @@
{{ label.title }}
%p
Starting out with the default set of lists will get you right on the way to making the most of your board.
%button
.btn.btn-create.btn-inverted.btn-block
{
type:
"button"
,
"@click"
=>
"addDefaultLists"
}
%button
.btn.btn-create.btn-inverted.btn-block
{
type:
"button"
,
"@click
.stop
"
=>
"addDefaultLists"
}
Add default lists
%button
.btn.btn-default.btn-block
{
type:
"button"
,
"@click"
=>
"clearBlankState"
}
%button
.btn.btn-default.btn-block
{
type:
"button"
,
"@click
.stop
"
=>
"clearBlankState"
}
Nevermind, I'll use my own
This diff is collapsed.
Click to expand it.
app/views/projects/boards/components/_board.html.haml
View file @
5c7fd643
...
...
@@ -16,7 +16,7 @@
%board-delete
{
"inline-template"
=>
true
,
"v-if"
=>
"!isPreset"
,
":list"
=>
"list"
}
%button
.board-delete.has-tooltip.pull-right
{
type:
"button"
,
title:
"Delete list"
,
"aria-label"
=>
"Delete list"
,
data:
{
placement:
"bottom"
},
"@click"
=>
"deleteBoard"
}
%button
.board-delete.has-tooltip.pull-right
{
type:
"button"
,
title:
"Delete list"
,
"aria-label"
=>
"Delete list"
,
data:
{
placement:
"bottom"
},
"@click
.stop
"
=>
"deleteBoard"
}
=
icon
(
"trash"
)
=
icon
(
"spinner spin"
,
class:
"board-header-loading-spinner pull-right"
,
"v-show"
=>
"list.loadingMore"
)
.board-inner-container.board-search-container
{
"v-if"
=>
"list.canSearch()"
}
...
...
This diff is collapsed.
Click to expand it.
spec/features/boards/boards_spec.rb
View file @
5c7fd643
...
...
@@ -26,7 +26,7 @@ describe 'Issue Boards', feature: true, js: true do
it
'hides the blank state when clicking nevermind button'
do
page
.
within
(
'.board-blank-state'
)
do
click_button
(
'Nevermind, I\'ll use my own'
)
click_button
(
"Nevermind, I'll use my own"
)
end
expect
(
page
).
to
have_selector
(
'.board'
,
count:
2
)
end
...
...
This diff is collapsed.
Click to expand it.
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