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
Léo-Paul Géneau
gitlab-ce
Commits
61fa7b75
Commit
61fa7b75
authored
Jul 26, 2016
by
Phil Hughes
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Removes boards correctly
parent
c369ea6c
Changes
6
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
17 additions
and
3 deletions
+17
-3
app/assets/javascripts/boards/components/board.js.coffee
app/assets/javascripts/boards/components/board.js.coffee
+3
-1
app/assets/javascripts/boards/components/board_delete.js.coffee
...sets/javascripts/boards/components/board_delete.js.coffee
+6
-0
app/assets/javascripts/boards/components/board_list.js.coffee
...assets/javascripts/boards/components/board_list.js.coffee
+2
-0
app/assets/javascripts/boards/stores/boards_store.js.coffee
app/assets/javascripts/boards/stores/boards_store.js.coffee
+3
-0
app/assets/stylesheets/pages/boards.scss
app/assets/stylesheets/pages/boards.scss
+1
-0
app/views/projects/boards/components/_board.html.haml
app/views/projects/boards/components/_board.html.haml
+2
-2
No files found.
app/assets/javascripts/boards/components/board.js.coffee
View file @
61fa7b75
...
@@ -10,7 +10,7 @@ Board = Vue.extend
...
@@ -10,7 +10,7 @@ Board = Vue.extend
isPreset
:
->
isPreset
:
->
typeof
this
.
board
.
id
!=
'number'
typeof
this
.
board
.
id
!=
'number'
ready
:
->
ready
:
->
Sortable
.
create
this
.
$el
.
parentNode
,
this
.
sortable
=
Sortable
.
create
this
.
$el
.
parentNode
,
group
:
'boards'
group
:
'boards'
animation
:
150
animation
:
150
draggable
:
'.is-draggable'
draggable
:
'.is-draggable'
...
@@ -19,5 +19,7 @@ Board = Vue.extend
...
@@ -19,5 +19,7 @@ Board = Vue.extend
ghostClass
:
'is-ghost'
ghostClass
:
'is-ghost'
onUpdate
:
(
e
)
->
onUpdate
:
(
e
)
->
BoardsStore
.
moveBoard
(
e
.
oldIndex
+
1
,
e
.
newIndex
+
1
)
BoardsStore
.
moveBoard
(
e
.
oldIndex
+
1
,
e
.
newIndex
+
1
)
beforeDestroy
:
->
this
.
sortable
.
destroy
()
Vue
.
component
(
'board'
,
Board
)
Vue
.
component
(
'board'
,
Board
)
app/assets/javascripts/boards/components/board_delete.js.coffee
View file @
61fa7b75
BoardDelete
=
Vue
.
extend
BoardDelete
=
Vue
.
extend
props
:
props
:
boardId
:
Number
boardId
:
Number
methods
:
deleteBoard
:
->
$
(
this
.
$el
).
tooltip
(
'destroy'
)
if
confirm
(
'Are you sure you want to delete this list?'
)
BoardsStore
.
removeBoard
(
this
.
boardId
)
Vue
.
component
'board-delete'
,
BoardDelete
Vue
.
component
'board-delete'
,
BoardDelete
app/assets/javascripts/boards/components/board_list.js.coffee
View file @
61fa7b75
...
@@ -56,5 +56,7 @@ BoardList = Vue.extend
...
@@ -56,5 +56,7 @@ BoardList = Vue.extend
this
.
$els
.
list
.
onscroll
=
=>
this
.
$els
.
list
.
onscroll
=
=>
if
(
this
.
scrollTop
()
>
this
.
scrollHeight
()
-
this
.
scrollOffset
)
and
!
this
.
loadMore
if
(
this
.
scrollTop
()
>
this
.
scrollHeight
()
-
this
.
scrollOffset
)
and
!
this
.
loadMore
this
.
loadFromLastId
()
this
.
loadFromLastId
()
beforeDestroy
:
->
this
.
sortable
.
destroy
()
Vue
.
component
(
'board-list'
,
BoardList
)
Vue
.
component
(
'board-list'
,
BoardList
)
app/assets/javascripts/boards/stores/boards_store.js.coffee
View file @
61fa7b75
...
@@ -6,6 +6,9 @@
...
@@ -6,6 +6,9 @@
author
:
{}
author
:
{}
assignee
:
{}
assignee
:
{}
milestone
:
{}
milestone
:
{}
removeBoard
:
(
id
)
->
BoardsStore
.
state
.
boards
=
_
.
reject
BoardsStore
.
state
.
boards
,
(
board
)
->
board
.
id
is
id
moveBoard
:
(
oldIndex
,
newIndex
)
->
moveBoard
:
(
oldIndex
,
newIndex
)
->
boardFrom
=
_
.
find
BoardsStore
.
state
.
boards
,
(
board
)
->
boardFrom
=
_
.
find
BoardsStore
.
state
.
boards
,
(
board
)
->
board
.
index
is
oldIndex
board
.
index
is
oldIndex
...
...
app/assets/stylesheets/pages/boards.scss
View file @
61fa7b75
...
@@ -110,6 +110,7 @@
...
@@ -110,6 +110,7 @@
color
:
$gray-darkest
;
color
:
$gray-darkest
;
background-color
:
transparent
;
background-color
:
transparent
;
border
:
0
;
border
:
0
;
outline
:
0
;
&
:hover
{
&
:hover
{
color
:
$gl-link-color
;
color
:
$gl-link-color
;
...
...
app/views/projects/boards/components/_board.html.haml
View file @
61fa7b75
...
@@ -6,8 +6,8 @@
...
@@ -6,8 +6,8 @@
{{ board.title }}
{{ board.title }}
%span
.pull-right
%span
.pull-right
{{ board.issues.length }}
{{ board.issues.length }}
%board-delete
{
"inline-template"
=>
true
,
"v-if"
=>
"!isPreset"
}
%board-delete
{
"inline-template"
=>
true
,
"v-if"
=>
"!isPreset"
,
":board-id"
=>
"board.id"
}
%button
.board-delete.has-tooltip.pull-right
{
type:
"button"
,
title:
"Delete board"
,
data:
{
placement:
"bottom"
}
}
%button
.board-delete.has-tooltip.pull-right
{
type:
"button"
,
title:
"Delete board"
,
data:
{
placement:
"bottom"
}
,
"@click"
=>
"deleteBoard"
}
%span
.sr-only
%span
.sr-only
Delete board
Delete board
=
icon
(
"trash"
)
=
icon
(
"trash"
)
...
...
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