Fixed cherry pick footer settings

Cherry pick footer options were never read for projects without an access
category in the project.config file. This has now been corrected.

Task-number: QTQAINFRA-348
Change-Id: I2e8ee0da816a028969b740a5acd034d84e636a4a
Reviewed-by: Ola Bjuremo <ola.bjuremo@tieto.com>
Reviewed-by: Tomas Ljunggren <tomas.ljunggren@tieto.com>

1 files changed, 5 insertions, 8 deletions

diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/git/ProjectConfig.java b/gerrit-server/src/main/java/com/google/gerrit/server/git/ProjectConfig.java
index 7f0b74a77f..36eddef87f 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/git/ProjectConfig.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/git/ProjectConfig.java
@@ -198,10 +198,14 @@ public class ProjectConfig extends VersionedMetaData {
 
     p.setSubmitType(rc.getEnum(SUBMIT, null, KEY_ACTION, defaultSubmitAction));
     p.setUseContentMerge(rc.getBoolean(SUBMIT, null, KEY_MERGE_CONTENT, false));
-    
+
     p.setIncludeOnlyMaxApproval(rc.getBoolean(CHERRY_PICK, INCLUDE_ONLY_MAX_APPROVALS, false));
     p.setHideReviewedOn(rc.getBoolean(CHERRY_PICK, HIDE_REVIEWED_ON, false));
 
+    for (String category : rc.getNames(CHERRY_PICK, CATEGORY_FOOTERS)) {
+      final boolean value = rc.getBoolean(CATEGORY_FOOTERS, category, true);
+      p.addHiddenFooter(category, value);
+    }
     accessSections = new HashMap<String, AccessSection>();
     for (String refName : rc.getSubsections(ACCESS)) {
       if (isAccessSection(refName)) {
@@ -214,16 +218,9 @@ public class ProjectConfig extends VersionedMetaData {
             }
           }
         }
-
         for (String varName : rc.getNames(ACCESS, refName)) {
           if (isPermission(varName)) {
             Permission perm = as.getPermission(varName, true);
-    for (String category : rc.getNames(CHERRY_PICK, CATEGORY_FOOTERS)) {
-      final boolean value = rc.getBoolean(CATEGORY_FOOTERS, category, true);
-      p.addHiddenFooter(category, value);
-    }
-
-
             boolean useRange = perm.isLabel();
             for (String ruleString : rc.getStringList(ACCESS, refName, varName)) {
               PermissionRule rule;