Skip to content
Snippets Groups Projects
Commit fbe91125 authored by Heinrich Lee Yu's avatar Heinrich Lee Yu
Browse files

Update project selection dropdown API params

parent 2ec2a906
No related branches found
No related tags found
No related merge requests found
Loading
Loading
@@ -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);
});
Loading
Loading
Loading
Loading
@@ -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';
Loading
Loading
@@ -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,
);
Loading
Loading
Loading
Loading
@@ -9,7 +9,7 @@
= render 'shared/issuable/nav', type: :issues
.nav-controls
= render 'shared/issuable/feed_buttons'
= render 'shared/new_project_item_select', path: 'issues/new', label: "New issue", type: :issues, with_feature_enabled: 'issues'
= render 'shared/new_project_item_select', path: 'issues/new', label: "New issue", type: :issues, with_feature_enabled: 'issues', include_shared: false, include_projects_in_subgroups: true
 
= render 'shared/issuable/search_bar', type: :issues
 
Loading
Loading
Loading
Loading
@@ -7,7 +7,7 @@
= render 'shared/issuable/nav', type: :merge_requests
- if current_user
.nav-controls
= render 'shared/new_project_item_select', path: 'merge_requests/new', label: "New merge request", type: :merge_requests, with_feature_enabled: 'merge_requests'
= render 'shared/new_project_item_select', path: 'merge_requests/new', label: "New merge request", type: :merge_requests, with_feature_enabled: 'merge_requests', include_shared: false, include_projects_in_subgroups: true
 
= render 'shared/issuable/search_bar', type: :merge_requests
 
Loading
Loading
Loading
Loading
@@ -2,6 +2,6 @@
.project-item-select-holder.btn-group
%a.btn.btn-success.new-project-item-link.qa-new-project-item-link{ href: '', data: { label: local_assigns[:label], type: local_assigns[:type] } }
= icon('spinner spin')
= project_select_tag :project_path, class: "project-item-select", data: { include_groups: local_assigns[:include_groups], order_by: 'last_activity_at', relative_path: local_assigns[:path] }, with_feature_enabled: local_assigns[:with_feature_enabled]
= project_select_tag :project_path, class: "project-item-select", data: { include_groups: local_assigns[:include_groups], order_by: 'last_activity_at', relative_path: local_assigns[:path], include_shared: local_assigns[:include_shared], include_projects_in_subgroups: local_assigns[:include_projects_in_subgroups] }, with_feature_enabled: local_assigns[:with_feature_enabled]
%button.btn.btn-success.new-project-item-select-button.qa-new-project-item-select-button
= icon('caret-down')
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment