diff options
| author | Felipe Artur <felipefac@gmail.com> | 2017-09-06 11:17:06 -0300 |
|---|---|---|
| committer | Felipe Artur <felipefac@gmail.com> | 2017-09-06 11:17:06 -0300 |
| commit | f9fbae2e2712f3e7416c01c5e7ef6a6e021566b9 (patch) | |
| tree | a92d654de065857c1d9dc75a9e1a24058cbc914d | |
| parent | 563c7de58e010ddbede4fdf5de8229617ef9f96f (diff) | |
| download | gitlab-ce-f9fbae2e2712f3e7416c01c5e7ef6a6e021566b9.tar.gz | |
Finish backports and fix specs
| -rw-r--r-- | app/assets/javascripts/api.js | 14 | ||||
| -rw-r--r-- | app/assets/javascripts/boards/components/issue_card_inner.js | 2 | ||||
| -rw-r--r-- | app/controllers/boards/issues_controller.rb | 2 |
3 files changed, 14 insertions, 4 deletions
diff --git a/app/assets/javascripts/api.js b/app/assets/javascripts/api.js index 7b00e1fa780..38d1effc77c 100644 --- a/app/assets/javascripts/api.js +++ b/app/assets/javascripts/api.js @@ -6,7 +6,8 @@ const Api = { namespacesPath: '/api/:version/namespaces.json', groupProjectsPath: '/api/:version/groups/:id/projects.json', projectsPath: '/api/:version/projects.json', - labelsPath: '/:namespace_path/:project_path/labels', + projectLabelsPath: '/:namespace_path/:project_path/labels', + groupLabelsPath: '/groups/:namespace_path/labels', licensePath: '/api/:version/templates/licenses/:key', gitignorePath: '/api/:version/templates/gitignores/:key', gitlabCiYmlPath: '/api/:version/templates/gitlab_ci_ymls/:key', @@ -74,7 +75,16 @@ const Api = { }, newLabel(namespacePath, projectPath, data, callback) { - const url = Api.buildUrl(Api.labelsPath); + let url; + + if (projectPath) { + url = Api.buildUrl(Api.projectLabelsPath) + .replace(':namespace_path', namespacePath) + .replace(':project_path', projectPath); + } else { + url = Api.buildUrl(Api.groupLabelsPath).replace(':namespace_path', namespacePath); + } + return $.ajax({ url, type: 'POST', diff --git a/app/assets/javascripts/boards/components/issue_card_inner.js b/app/assets/javascripts/boards/components/issue_card_inner.js index 26f0a41c0ca..bf474879024 100644 --- a/app/assets/javascripts/boards/components/issue_card_inner.js +++ b/app/assets/javascripts/boards/components/issue_card_inner.js @@ -64,7 +64,7 @@ gl.issueBoards.IssueCardInner = Vue.extend({ return this.issue.assignees.length > this.numberOverLimit; }, cardUrl() { - return `${this.issueLinkBase}/${this.issue.id}`; + return `${this.issueLinkBase}/${this.issue.iid}`; }, issueId() { if (this.issue.iid) { diff --git a/app/controllers/boards/issues_controller.rb b/app/controllers/boards/issues_controller.rb index 016059b3a51..8d4ec2d6d9d 100644 --- a/app/controllers/boards/issues_controller.rb +++ b/app/controllers/boards/issues_controller.rb @@ -61,7 +61,7 @@ module Boards end def project - @project ||= Project.find(issue_params[:project_id]) + board_parent end def move_params |