| commit | ef54d2ca899cfdf7cbbd7a40bb8796f4fa863915 | [log] [tgz] |
|---|---|---|
| author | David Pursehouse <dpursehouse@collab.net> | Fri Apr 28 18:38:01 2017 +0200 |
| committer | David Pursehouse <dpursehouse@collab.net> | Fri Apr 28 18:38:05 2017 +0200 |
| tree | 6e99a8c795c007ea12302e572803e4cb9701a892 | |
| parent | 7cd9041726c5a2996979440e3d7d049118bdc391 [diff] | |
| parent | de4d6b68b991eab4b4b0c24573c4514a9b171303 [diff] |
Merge branch 'stable-2.14' * stable-2.14: Fix dashboards to use isVisible Change-Id: I13389107458cc5e1eb8dedda70745bcebcfc1293
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/project/DashboardsCollection.java b/gerrit-server/src/main/java/com/google/gerrit/server/project/DashboardsCollection.java index 44d3b5c..2747e68 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/project/DashboardsCollection.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/project/DashboardsCollection.java
@@ -120,7 +120,7 @@ if (!ref.startsWith(REFS_DASHBOARDS)) { ref = REFS_DASHBOARDS + ref; } - if (!Repository.isValidRefName(ref) || !ctl.controlForRef(ref).canRead()) { + if (!Repository.isValidRefName(ref) || !ctl.controlForRef(ref).isVisible()) { throw new ResourceNotFoundException(id); }
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/project/ListDashboards.java b/gerrit-server/src/main/java/com/google/gerrit/server/project/ListDashboards.java index fdc8e4f..d60a4a7 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/project/ListDashboards.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/project/ListDashboards.java
@@ -106,7 +106,7 @@ RevWalk rw = new RevWalk(git)) { List<DashboardInfo> all = new ArrayList<>(); for (Ref ref : git.getRefDatabase().getRefs(REFS_DASHBOARDS).values()) { - if (ctl.controlForRef(ref.getName()).canRead()) { + if (ctl.controlForRef(ref.getName()).isVisible()) { all.addAll(scanDashboards(ctl.getProject(), git, rw, ref, project, setDefault)); } }