Fixed cherry pick options in All-Projects

Cherry pick options was previously visible also in the
All-Projects view. Fixed visibility for cherry pick options
panel so that it is visible only for actual projects.

Change-Id: I9b9fb131eba7b051a8a00ca1d248225622b44a0b

1 files changed, 9 insertions, 3 deletions

diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/ProjectInfoScreen.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/ProjectInfoScreen.java
index 07357ff3c6..d6bca78767 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/ProjectInfoScreen.java
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/ProjectInfoScreen.java
@@ -189,10 +189,14 @@ public class ProjectInfoScreen extends ProjectScreen {
     final boolean isCherryPickSubmitType =
       SubmitType.CHERRY_PICK.equals(Project.SubmitType.valueOf(
           submitType.getValue(submitType.getSelectedIndex())));
-    includeReviewedOn.setEnabled(isCherryPickSubmitType);
-    includeOnlyMaxApproval.setEnabled(isCherryPickSubmitType);
+    enableCherryPickOptions(isCherryPickSubmitType);
+  }
+
+  private void enableCherryPickOptions(final boolean enable) {
+    includeReviewedOn.setEnabled(enable);
+    includeOnlyMaxApproval.setEnabled(enable);
     for (CheckBox checkBox : approvalsInFooter.values()) {
-      checkBox.setEnabled(isCherryPickSubmitType);
+      checkBox.setEnabled(enable);
     }
   }
 
@@ -263,6 +267,7 @@ public class ProjectInfoScreen extends ProjectScreen {
 
     includeOnlyMaxApproval.setValue(project.isIncludeOnlyMaxApproval());
     includeReviewedOn.setValue(!project.isHideReviewedOn());
+    cherryPickPanel.setVisible(!isall);
 
     Map<String, Boolean> hiddenFooters = project.getHiddenFooters();
     for (Entry<String, CheckBox> entry : approvalsInFooter.entrySet()) {
@@ -297,6 +302,7 @@ public class ProjectInfoScreen extends ProjectScreen {
     }
 
     enableForm(false, false, false);
+    enableCherryPickOptions(false);
 
     Util.PROJECT_SVC.changeProjectSettings(project,
         new GerritCallback<ProjectDetail>() {