diff options
author | Phil Hughes <me@iamphill.com> | 2016-08-15 09:41:06 +0100 |
---|---|---|
committer | Phil Hughes <me@iamphill.com> | 2016-08-17 17:17:39 +0100 |
commit | abb55af272beafd71fd69400be3dbd1a16d81654 (patch) | |
tree | 0b1d01bd628be21a6a57b52f13938683ffd5129e /app/assets/javascripts/boards/components/board.js.es6 | |
parent | 5c7fd643a6043dddc6479fe9bd75b49754cbb098 (diff) | |
download | gitlab-ce-abb55af272beafd71fd69400be3dbd1a16d81654.tar.gz |
Fixed blank state issue
Updated some parts based on feedback
Diffstat (limited to 'app/assets/javascripts/boards/components/board.js.es6')
-rw-r--r-- | app/assets/javascripts/boards/components/board.js.es6 | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/app/assets/javascripts/boards/components/board.js.es6 b/app/assets/javascripts/boards/components/board.js.es6 index f402206ca00..79727b96874 100644 --- a/app/assets/javascripts/boards/components/board.js.es6 +++ b/app/assets/javascripts/boards/components/board.js.es6 @@ -31,9 +31,11 @@ this.query = ''; }, getFilterData () { + if (!this.list.canSearch()) return this.filters; + const filters = this.filters; - let queryData = this.list.canSearch() ? { search: this.query } : {}; - + let queryData = { search: this.query }; + Object.keys(filters).forEach((key) => { queryData[key] = filters[key]; }); return queryData; @@ -41,7 +43,7 @@ }, computed: { isPreset () { - return this.list.type === 'backlog' || this.list.type === 'done' || this.list.type === 'blank'; + return ['backlog', 'done', 'blank'].indexOf(this.list.type) > -1; } }, ready () { @@ -59,7 +61,10 @@ options.handle = '.js-board-drag-handle'; } - Sortable.create(this.$el.parentNode, options); + this.sortable = Sortable.create(this.$el.parentNode, options); + }, + beforeDestroy () { + this.sortable.destroy(); } }); |