summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlfredo Sumaran <alfredo@gitlab.com>2017-03-21 00:10:36 +0000
committerLin Jen-Shin <godfat@godfat.org>2017-03-21 17:36:48 +0800
commit685590ee7313c4d965abd25c273aedd9b39b6525 (patch)
tree3a8e6058c6d66997b468e4e828a0602ea4c15837
parenta1a2c9f771a483f58efc46245529f7041ea45968 (diff)
downloadgitlab-ce-685590ee7313c4d965abd25c273aedd9b39b6525.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.js4
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 f290cd13763..745faf886b6 100644
--- a/app/assets/javascripts/boards/components/modal/index.js
+++ b/app/assets/javascripts/boards/components/modal/index.js
@@ -66,6 +66,7 @@ require('./empty_state');
},
filter: {
handler() {
+ this.page = 1;
this.loadIssues(true);
},
deep: true,
@@ -123,6 +124,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,