diff options
author | Jan Beckmann <king-jan1999@hotmail.de> | 2018-07-02 08:04:43 +0000 |
---|---|---|
committer | Sean McGivern <sean@mcgivern.me.uk> | 2018-07-02 08:04:43 +0000 |
commit | 352e322291fe2ebccf055d55b4040677c106b6e1 (patch) | |
tree | e5460461cf9d286ec64a571287045909bfafc45e /app/assets/javascripts | |
parent | 1de68dc33fc7ed34c7f3d33c6186026c38c5b51a (diff) | |
download | gitlab-ce-352e322291fe2ebccf055d55b4040677c106b6e1.tar.gz |
Resolve "404 when trying to create a new issue from the group"
Diffstat (limited to 'app/assets/javascripts')
-rw-r--r-- | app/assets/javascripts/api.js | 11 | ||||
-rw-r--r-- | app/assets/javascripts/pages/search/show/search.js | 2 | ||||
-rw-r--r-- | app/assets/javascripts/project_select.js | 5 |
3 files changed, 11 insertions, 7 deletions
diff --git a/app/assets/javascripts/api.js b/app/assets/javascripts/api.js index d62fae99c6b..0ca0e8f35dd 100644 --- a/app/assets/javascripts/api.js +++ b/app/assets/javascripts/api.js @@ -150,14 +150,15 @@ const Api = { }, // Return group projects list. Filtered by query - groupProjects(groupId, query, callback) { + groupProjects(groupId, query, options, callback) { const url = Api.buildUrl(Api.groupProjectsPath).replace(':id', groupId); + const defaults = { + search: query, + per_page: 20, + }; return axios .get(url, { - params: { - search: query, - per_page: 20, - }, + params: Object.assign({}, defaults, options), }) .then(({ data }) => callback(data)); }, diff --git a/app/assets/javascripts/pages/search/show/search.js b/app/assets/javascripts/pages/search/show/search.js index 2e1fe78b3fa..e3e0ab91993 100644 --- a/app/assets/javascripts/pages/search/show/search.js +++ b/app/assets/javascripts/pages/search/show/search.js @@ -105,7 +105,7 @@ export default class Search { getProjectsData(term) { return new Promise((resolve) => { if (this.groupId) { - Api.groupProjects(this.groupId, term, resolve); + Api.groupProjects(this.groupId, term, {}, resolve); } else { Api.projects(term, { order_by: 'id', diff --git a/app/assets/javascripts/project_select.js b/app/assets/javascripts/project_select.js index 240dde56325..bce7556bd40 100644 --- a/app/assets/javascripts/project_select.js +++ b/app/assets/javascripts/project_select.js @@ -47,7 +47,10 @@ export default function projectSelect() { projectsCallback = finalCallback; } if (_this.groupId) { - return Api.groupProjects(_this.groupId, query.term, projectsCallback); + return Api.groupProjects(_this.groupId, query.term, { + with_issues_enabled: _this.withIssuesEnabled, + with_merge_requests_enabled: _this.withMergeRequestsEnabled, + }, projectsCallback); } else { return Api.projects(query.term, { order_by: _this.orderBy, |