diff options
author | Heinrich Lee Yu <hleeyu@gmail.com> | 2018-10-26 09:05:34 +0300 |
---|---|---|
committer | Heinrich Lee Yu <hleeyu@gmail.com> | 2018-11-19 18:59:54 +0300 |
commit | fbe91125bed5d8f0ca98833eca3d33f531c79922 (patch) | |
tree | 2a688a88904862e71d60b8014348e197d08b4681 /app/assets/javascripts | |
parent | 2ec2a906b552d5f4a486130b88a39a4a14e7b28f (diff) |
Update project selection dropdown API params
Diffstat (limited to 'app/assets/javascripts')
-rw-r--r-- | app/assets/javascripts/boards/components/project_select.vue | 6 | ||||
-rw-r--r-- | app/assets/javascripts/project_select.js | 4 |
2 files changed, 9 insertions, 1 deletions
diff --git a/app/assets/javascripts/boards/components/project_select.vue b/app/assets/javascripts/boards/components/project_select.vue index 83e6e237757..151f814af35 100644 --- a/app/assets/javascripts/boards/components/project_select.vue +++ b/app/assets/javascripts/boards/components/project_select.vue @@ -48,7 +48,11 @@ export default { selectable: true, data: (term, callback) => { this.loading = true; - return Api.groupProjects(this.groupId, term, { with_issues_enabled: true }, projects => { + return Api.groupProjects(this.groupId, term, { + with_issues_enabled: true, + include_shared: false, + include_subgroups: true + }, projects => { this.loading = false; callback(projects); }); diff --git a/app/assets/javascripts/project_select.js b/app/assets/javascripts/project_select.js index f1fff173619..ce407c60724 100644 --- a/app/assets/javascripts/project_select.js +++ b/app/assets/javascripts/project_select.js @@ -14,6 +14,8 @@ export default function projectSelect() { this.orderBy = $(select).data('orderBy') || 'id'; this.withIssuesEnabled = $(select).data('withIssuesEnabled'); this.withMergeRequestsEnabled = $(select).data('withMergeRequestsEnabled'); + this.includeShared = $(select).data('includeShared') === undefined ? true : $(select).data('includeShared'); + this.includeProjectsInSubgroups = $(select).data('includeProjectsInSubgroups') || false; this.allowClear = $(select).data('allowClear') || false; placeholder = 'Search for project'; @@ -54,6 +56,8 @@ export default function projectSelect() { { with_issues_enabled: _this.withIssuesEnabled, with_merge_requests_enabled: _this.withMergeRequestsEnabled, + include_shared: _this.includeShared, + include_subgroups: _this.includeProjectsInSubgroups, }, projectsCallback, ); |