diff options
author | Alfredo Sumaran <alfredo@gitlab.com> | 2017-03-21 00:10:36 +0000 |
---|---|---|
committer | Alfredo Sumaran <alfredo@gitlab.com> | 2017-03-21 00:10:36 +0000 |
commit | 7601d8b0b764d02f3db796a604575ef2638a8a7f (patch) | |
tree | 837acd1529b016c6e1e0a174b1f38c1b5987e465 | |
parent | 2de664b17898cefd7966969fd78509175a0a1c72 (diff) | |
parent | 03f6f51dcf5b0401257cddf8cbfd83aa1426f4bc (diff) | |
download | gitlab-ce-7601d8b0b764d02f3db796a604575ef2638a8a7f.tar.gz |
Merge branch 'clear-page-param-after-filter-in-add-issues-modal' into 'master'
Reset issue boards add issues modal page when filtering
Closes #29616
See merge request !10039
-rw-r--r-- | app/assets/javascripts/boards/components/modal/index.js | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/app/assets/javascripts/boards/components/modal/index.js b/app/assets/javascripts/boards/components/modal/index.js index 1b66c8b922d..4240c97617d 100644 --- a/app/assets/javascripts/boards/components/modal/index.js +++ b/app/assets/javascripts/boards/components/modal/index.js @@ -64,6 +64,7 @@ require('./empty_state'); }, filter: { handler() { + this.page = 1; this.loadIssues(true); }, deep: true, @@ -115,6 +116,9 @@ require('./empty_state'); return this.activeTab === 'selected' && this.selectedIssues.length === 0; }, }, + created() { + this.page = 1; + }, components: { 'modal-header': gl.issueBoards.ModalHeader, 'modal-list': gl.issueBoards.ModalList, |