Fix assign_to_me issue action

diff --git a/sonar-server/src/main/coffee/issues/issue-view.coffee b/sonar-server/src/main/coffee/issues/issue-view.coffee
index 21039ad32c27bdc610dca7f58b8836e09eb1bdcb..6f9022f6f6631666dfa58091e5d388bb60ad0831 100644 (file)
--- 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 08e8832fe6a59df539e2557992ba990bcb9a420d..b51435b63af4178cd4aea75cb07dd2059b9c6d4b 100644 (file)
--- 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()