commit 6e5d0ed84e9a6f9c5701f4665f9e3d5c96e4c0aa
author Shawn Pearce <sop@google.com> Thu Apr 02 19:34:34 2015 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Apr 02 19:34:34 2015 +0000
tree 34b01adecb2ffece0ce5e1a22e4bdd5e0d339313
parent b74653274cc5d225152defedff607399a7e6eb50
parent 1fdf7131206f41d2e46c3195e3a763e7da30a562

Merge "Revert "Improve error message for grayed out submit buttons""

gerrit-server/src/main/java/com/google/gerrit/server/change/Submit.java

diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/Submit.java b/gerrit-server/src/main/java/com/google/gerrit/server/change/Submit.java
index 064f0e8..306b515 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/change/Submit.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/change/Submit.java
@@ -100,10 +100,6 @@
       "Other changes in this topic are not ready";
   private static final String BLOCKED_HIDDEN_TOPIC_TOOLTIP =
       "Other hidden changes in this topic are not ready";
-  private static final String CLICK_FAILURE_TOOLTIP =
-      "Clicking the button would fail for this change.";
-  private static final String CLICK_FAILURE_OTHER_TOOLTIP =
-      "Clicking the button would fail for other changes.";
 
   public enum Status {
     SUBMITTED, MERGED
@@ -249,22 +245,14 @@
   }
 
   /**
-   * @param changeList list of changes to be submitted at once
+   * @param changes list of changes to be submitted at once
    * @param identifiedUser the user who is checking to submit
    * @return a reason why any of the changes is not submittable or null
    */
-  private String problemsForSubmittingChanges(
-      RevisionResource resource,
-      List<ChangeData> changeList,
+  private String problemsForSubmittingChanges(List<ChangeData> changes,
       IdentifiedUser identifiedUser) {
-    try {
-      if (!mergeableProvider.get().apply(resource).mergeable) {
-        return CLICK_FAILURE_TOOLTIP;
-      }
-      for (ChangeData c : changeList) {
-        if (!c.isMergeable()) {
-          return CLICK_FAILURE_OTHER_TOOLTIP;
-        }
+    for (ChangeData c : changes) {
+      try {
         ChangeControl changeControl = c.changeControl().forUser(
             identifiedUser);
         if (!changeControl.isVisible(dbProvider.get())) {
@@ -274,10 +262,12 @@
           return BLOCKED_TOPIC_TOOLTIP;
         }
         checkSubmitRule(c, c.currentPatchSet(), false);
+      } catch (OrmException e) {
+        log.error("Error checking if change is submittable", e);
+        throw new OrmRuntimeException(e);
+      } catch (ResourceConflictException e) {
+        return BLOCKED_TOPIC_TOOLTIP;
       }
-    } catch (RestApiException | OrmException | IOException e) {
-      log.error("Error checking if change is submittable", e);
-      throw new OrmRuntimeException("Could not determine problems for the change", e);
     }
     return null;
   }
@@ -293,8 +283,8 @@
 
     ReviewDb db = dbProvider.get();
     ChangeData cd = changeDataFactory.create(db, resource.getControl());
-    if (problemsForSubmittingChanges(
-        resource, Arrays.asList(cd), resource.getUser()) != null) {
+    if (problemsForSubmittingChanges(Arrays.asList(cd), resource.getUser())
+        != null) {
       visible = false;
     }
 
@@ -321,8 +311,8 @@
         && changesByTopic.size() > 1) {
       Map<String, String> params = ImmutableMap.of(
           "topicSize", String.valueOf(changesByTopic.size()));
-      String topicProblems = problemsForSubmittingChanges(
-          resource, changesByTopic, resource.getUser());
+      String topicProblems = problemsForSubmittingChanges(changesByTopic,
+          resource.getUser());
       if (topicProblems != null) {
         return new UiAction.Description()
           .setLabel(submitTopicLabel)
@@ -431,7 +421,7 @@
     ChangeData cd = changeDataFactory.create(db, rsrc.getControl());
 
     List<ChangeData> changesByTopic = queryProvider.get().byTopicOpen(topic);
-    String problems = problemsForSubmittingChanges(rsrc, changesByTopic, caller);
+    String problems = problemsForSubmittingChanges(changesByTopic, caller);
     if (problems != null) {
       throw new ResourceConflictException(problems);
     }