diff options
| author | Stas Vilchik <vilchiks@gmail.com> | 2014-07-04 11:49:42 +0600 |
|---|---|---|
| committer | Stas Vilchik <vilchiks@gmail.com> | 2014-07-04 12:52:28 +0600 |
| commit | 5aa75959f890ade091d204a05ae6c5738e977702 (patch) | |
| tree | 99edc68e7f35c7a418c46c2f9105762f6dcbe3f1 | |
| parent | e2853ac9b907dc14d43f4d285067cb8503bfa45c (diff) | |
| download | sonarqube-5aa75959f890ade091d204a05ae6c5738e977702.tar.gz sonarqube-5aa75959f890ade091d204a05ae6c5738e977702.zip | |
Fix assign_to_me issue action
(cherry picked from commit aa5964b)
| -rw-r--r-- | sonar-server/src/main/coffee/issues/issue-view.coffee | 2 | ||||
| -rw-r--r-- | sonar-server/src/main/coffee/issues/views/assign-form-view.coffee | 12 |
2 files changed, 7 insertions, 7 deletions
diff --git a/sonar-server/src/main/coffee/issues/issue-view.coffee b/sonar-server/src/main/coffee/issues/issue-view.coffee index 21039ad32c2..6f9022f6f66 100644 --- a/sonar-server/src/main/coffee/issues/issue-view.coffee +++ b/sonar-server/src/main/coffee/issues/issue-view.coffee @@ -230,7 +230,7 @@ define [ url: baseUrl + '/api/issues/assign' data: issue: @model.get('key') - assignee: window.SS.currentUser + me: true .done => @resetIssue() .fail (r) => alert _.pluck(r.responseJSON.errors, 'msg').join(' ') diff --git a/sonar-server/src/main/coffee/issues/views/assign-form-view.coffee b/sonar-server/src/main/coffee/issues/views/assign-form-view.coffee index 08e8832fe6a..b51435b63af 100644 --- a/sonar-server/src/main/coffee/issues/views/assign-form-view.coffee +++ b/sonar-server/src/main/coffee/issues/views/assign-form-view.coffee @@ -7,6 +7,7 @@ define [ ) -> $ = jQuery + ME = '#me#' class AssignFormView extends Marionette.ItemView @@ -28,7 +29,7 @@ define [ additionalChoices = [] if !assignee || currentUser != assignee - additionalChoices.push id: currentUser, text: t('assigned_to_me') + additionalChoices.push id: ME, text: t('assigned_to_me') if !!assignee additionalChoices.push id: '', text: t('unassigned') @@ -68,14 +69,13 @@ define [ submit: -> @options.detailView.showActionSpinner() - + data = issue: @options.issue.get('key') + if @ui.select.val() == ME then data.me = true else data.assignee = @ui.select.val() $.ajax type: 'POST' url: baseUrl + '/api/issues/assign' - data: - issue: @options.issue.get('key') - assignee: @ui.select.val() + data: data .done => @options.detailView.updateAfterAction true .fail (r) => alert _.pluck(r.responseJSON.errors, 'msg').join(' ') - @options.detailView.hideActionSpinner()
\ No newline at end of file + @options.detailView.hideActionSpinner() |