Merge branch 'develop' into dist/ubuntu/bionic/develop
This commit is contained in:
commit
88a0a5bebe
2
Makefile
2
Makefile
@ -26,5 +26,7 @@ clean:
|
|||||||
rm -rf release
|
rm -rf release
|
||||||
rm -rf vendor
|
rm -rf vendor
|
||||||
rm -rf bin
|
rm -rf bin
|
||||||
|
rm -rf client/node_modules
|
||||||
|
rm -rf client/dist/*
|
||||||
|
|
||||||
.PHONY: lint watch build vendor tidy release
|
.PHONY: lint watch build vendor tidy release
|
@ -58,7 +58,6 @@ function handleMoveCard(state, action) {
|
|||||||
} else {
|
} else {
|
||||||
fromCards.splice(fromPosition, 1);
|
fromCards.splice(fromPosition, 1);
|
||||||
fromCards.splice(toPosition, 0, card);
|
fromCards.splice(toPosition, 0, card);
|
||||||
console.log(fromCards)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return {
|
return {
|
||||||
|
@ -10,6 +10,8 @@ export function* moveCardSaga(action) {
|
|||||||
toPosition,
|
toPosition,
|
||||||
} = action;
|
} = action;
|
||||||
|
|
||||||
|
if (fromLaneID === toLaneID) return;
|
||||||
|
|
||||||
const { board, kanboard} = yield select(state => {
|
const { board, kanboard} = yield select(state => {
|
||||||
return {
|
return {
|
||||||
kanboard: state.kanboards.byID[boardID],
|
kanboard: state.kanboards.byID[boardID],
|
||||||
|
Loading…
Reference in New Issue
Block a user