Paper bag fix submit action

Signed-off-by: Shawn O. Pearce <sop@google.com>

2 files changed, 2 insertions, 3 deletions

diff --git a/src/main/java/com/google/gerrit/server/rpc/changedetail/ChangeManageServiceImpl.java b/src/main/java/com/google/gerrit/server/rpc/changedetail/ChangeManageServiceImpl.java
index 57d5212f00..4217d95edb 100644
--- a/src/main/java/com/google/gerrit/server/rpc/changedetail/ChangeManageServiceImpl.java
+++ b/src/main/java/com/google/gerrit/server/rpc/changedetail/ChangeManageServiceImpl.java
@@ -32,7 +32,8 @@ class ChangeManageServiceImpl implements ChangeManageService {
 
   public void patchSetAction(final ApprovalCategoryValue.Id value,
       final PatchSet.Id patchSetId, final AsyncCallback<VoidResult> cb) {
-    if (ApprovalCategory.SUBMIT.equals(value) && value.get() == 1) {
+    final ApprovalCategory.Id category = value.getParentKey();
+    if (ApprovalCategory.SUBMIT.equals(category) && value.get() == 1) {
       submitAction.create(patchSetId).to(cb);
 
     } else {
diff --git a/src/main/java/com/google/gerrit/server/rpc/changedetail/SubmitAction.java b/src/main/java/com/google/gerrit/server/rpc/changedetail/SubmitAction.java
index 785c87b717..6eed8bb215 100644
--- a/src/main/java/com/google/gerrit/server/rpc/changedetail/SubmitAction.java
+++ b/src/main/java/com/google/gerrit/server/rpc/changedetail/SubmitAction.java
@@ -18,12 +18,10 @@ import static com.google.gerrit.client.reviewdb.ApprovalCategory.SUBMIT;
 
 import com.google.gerrit.client.data.ApprovalType;
 import com.google.gerrit.client.data.GerritConfig;
-import com.google.gerrit.client.reviewdb.Account;
 import com.google.gerrit.client.reviewdb.Change;
 import com.google.gerrit.client.reviewdb.ChangeApproval;
 import com.google.gerrit.client.reviewdb.PatchSet;
 import com.google.gerrit.client.reviewdb.ReviewDb;
-import com.google.gerrit.client.rpc.Common;
 import com.google.gerrit.client.rpc.NoSuchEntityException;
 import com.google.gerrit.git.MergeQueue;
 import com.google.gerrit.server.ChangeUtil;