SONAR-4421 Fix bug on transition action

8 files changed, 24 insertions, 26 deletions

diff --git a/sonar-server/src/main/java/org/sonar/server/issue/AssignAction.java b/sonar-server/src/main/java/org/sonar/server/issue/AssignAction.java
index 14b41c13bad..61995806499 100644
--- a/sonar-server/src/main/java/org/sonar/server/issue/AssignAction.java
+++ b/sonar-server/src/main/java/org/sonar/server/issue/AssignAction.java
@@ -35,13 +35,13 @@ import java.util.Map;
 
 public class AssignAction extends Action implements ServerComponent {
 
-  public static final String ASSIGN_ACTION_KEY = "assign";
+  public static final String KEY = "assign";
 
   private final UserFinder userFinder;
   private final IssueUpdater issueUpdater;
 
   public AssignAction(UserFinder userFinder, IssueUpdater issueUpdater) {
-    super(ASSIGN_ACTION_KEY);
+    super(KEY);
     this.userFinder = userFinder;
     this.issueUpdater = issueUpdater;
     super.setConditions(new IsUnResolved());
diff --git a/sonar-server/src/main/java/org/sonar/server/issue/CommentAction.java b/sonar-server/src/main/java/org/sonar/server/issue/CommentAction.java
index de6ed273edf..1b3b819d34f 100644
--- a/sonar-server/src/main/java/org/sonar/server/issue/CommentAction.java
+++ b/sonar-server/src/main/java/org/sonar/server/issue/CommentAction.java
@@ -32,13 +32,13 @@ import java.util.Map;
 
 public class CommentAction extends Action implements ServerComponent {
 
-  public static final String COMMENT_ACTION_KEY = "comment";
+  public static final String KEY = "comment";
   public static final String COMMENT_PROPERTY = "comment";
 
   private final IssueUpdater issueUpdater;
 
   public CommentAction(IssueUpdater issueUpdater) {
-    super(COMMENT_ACTION_KEY);
+    super(KEY);
     this.issueUpdater = issueUpdater;
   }
 
diff --git a/sonar-server/src/main/java/org/sonar/server/issue/IssueBulkChangeQuery.java b/sonar-server/src/main/java/org/sonar/server/issue/IssueBulkChangeQuery.java
index 172f6f34b74..6f20133a3c3 100644
--- a/sonar-server/src/main/java/org/sonar/server/issue/IssueBulkChangeQuery.java
+++ b/sonar-server/src/main/java/org/sonar/server/issue/IssueBulkChangeQuery.java
@@ -72,10 +72,10 @@ public class IssueBulkChangeQuery {
       propertiesByActions.put(action, actionProperties);
     }
     if (!Strings.isNullOrEmpty(comment)) {
-      actions.add(CommentAction.COMMENT_ACTION_KEY);
+      actions.add(CommentAction.KEY);
       Map<String, Object> commentMap = newHashMap();
       commentMap.put(CommentAction.COMMENT_PROPERTY, comment);
-      propertiesByActions.put(CommentAction.COMMENT_ACTION_KEY, commentMap);
+      propertiesByActions.put(CommentAction.KEY, commentMap);
     }
   }
 
diff --git a/sonar-server/src/main/java/org/sonar/server/issue/PlanAction.java b/sonar-server/src/main/java/org/sonar/server/issue/PlanAction.java
index b43bedbba97..27fc90746ab 100644
--- a/sonar-server/src/main/java/org/sonar/server/issue/PlanAction.java
+++ b/sonar-server/src/main/java/org/sonar/server/issue/PlanAction.java
@@ -35,13 +35,13 @@ import java.util.Map;
 
 public class PlanAction extends Action implements ServerComponent {
 
-  public static final String PLAN_ACTION_KEY = "plan";
+  public static final String KEY = "plan";
 
   private final ActionPlanService actionPlanService;
   private final IssueUpdater issueUpdater;
 
   public PlanAction(ActionPlanService actionPlanService, IssueUpdater issueUpdater) {
-    super(PLAN_ACTION_KEY);
+    super(KEY);
     this.actionPlanService = actionPlanService;
     this.issueUpdater = issueUpdater;
     super.setConditions(new IsUnResolved());
diff --git a/sonar-server/src/main/java/org/sonar/server/issue/SetSeverityAction.java b/sonar-server/src/main/java/org/sonar/server/issue/SetSeverityAction.java
index b44fa04ffa5..15e00f97849 100644
--- a/sonar-server/src/main/java/org/sonar/server/issue/SetSeverityAction.java
+++ b/sonar-server/src/main/java/org/sonar/server/issue/SetSeverityAction.java
@@ -33,12 +33,12 @@ import java.util.Map;
 
 public class SetSeverityAction extends Action implements ServerComponent {
 
-  public static final String SET_SEVERITY_ACTION_KEY = "set_severity";
+  public static final String KEY = "set_severity";
 
   private final IssueUpdater issueUpdater;
 
   public SetSeverityAction(IssueUpdater issueUpdater) {
-    super(SET_SEVERITY_ACTION_KEY);
+    super(KEY);
     this.issueUpdater = issueUpdater;
     super.setConditions(new IsUnResolved());
   }
diff --git a/sonar-server/src/main/java/org/sonar/server/issue/TransitionAction.java b/sonar-server/src/main/java/org/sonar/server/issue/TransitionAction.java
index e954440132a..55b79598fb7 100644
--- a/sonar-server/src/main/java/org/sonar/server/issue/TransitionAction.java
+++ b/sonar-server/src/main/java/org/sonar/server/issue/TransitionAction.java
@@ -31,12 +31,12 @@ import java.util.Map;
 
 public class TransitionAction extends Action implements ServerComponent {
 
-  public static final String PLAN_ACTION_KEY = "transition";
+  public static final String KEY = "do_transition";
 
   private final IssueWorkflow workflow;
 
   public TransitionAction(IssueWorkflow workflow) {
-    super(PLAN_ACTION_KEY);
+    super(KEY);
     this.workflow = workflow;
   }
 
diff --git a/sonar-server/src/main/webapp/WEB-INF/app/controllers/api/issues_controller.rb b/sonar-server/src/main/webapp/WEB-INF/app/controllers/api/issues_controller.rb
index 1ebbb6bed68..c66bfd442c2 100644
--- a/sonar-server/src/main/webapp/WEB-INF/app/controllers/api/issues_controller.rb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/controllers/api/issues_controller.rb
@@ -263,7 +263,7 @@ class Api::IssuesController < Api::ApiController
   # 'assign.assignee' to assign all issues to a user or un-assign.
   # 'set_severity.severity' to change the severity of all issues.
   # 'plan.plan' to plan all issues to an action plan or unlink.
-  # 'transition.transition' to execute a transition on all issues.
+  # 'do_transition.transition' to execute a transition on all issues.
   # 'comment' to add a comment on all issues.
   #
   # -- Example
@@ -274,21 +274,19 @@ class Api::IssuesController < Api::ApiController
 
     comment = Api::Utils.read_post_request_param(params[:comment])
     result = Internal.issues.bulkChange(params, comment)
-    hash = result_to_hash(result)
-    if result.get
-      hash[:issuesChanged] = {
-          :total => result.get.issuesChanged().size,
-      }
-      hash[:issuesNotChanged] = {
-          :total => result.get.issuesNotChanged().size,
-          :issues => result.get.issuesNotChanged().map { |issue| issue.key() }
-      }
-    end
+    hash = {}
+    hash[:issuesChanged] = {
+        :total => result.issuesChanged().size,
+    }
+    hash[:issuesNotChanged] = {
+        :total => result.issuesNotChanged().size,
+        :issues => result.issuesNotChanged().map { |issue| issue.key() }
+    }
 
     respond_to do |format|
       # if the request header "Accept" is "*/*", then the default format is the first one (json)
-      format.json { render :json => jsonp(hash), :status => result.httpStatus }
-      format.xml { render :xml => hash.to_xml(:skip_types => true, :root => 'sonar', :status => (result.ok ? 200 : 400)) }
+      format.json { render :json => jsonp(hash), :status => 200 }
+      format.xml { render :xml => hash.to_xml(:skip_types => true, :root => 'sonar', :status => 200) }
     end
   end
 
diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/issues/_bulk_change_form.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/issues/_bulk_change_form.html.erb
index dbfa1807183..160777eb823 100644
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/issues/_bulk_change_form.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/issues/_bulk_change_form.html.erb
@@ -139,7 +139,7 @@
   });
 
   function addTransitionAction() {
-    $j('#bulk-change-transition-action').val("transition");
+    $j('#bulk-change-transition-action').val("do_transition");
   }
 
   function displayLoadingImage() {