Install the MenuFilter as high priority on top of all URLs
There is no need to install the MenuFilter using the special mechanism of
gitiles.
The gitiles mechanism places the filter as low priority after the built-in
filters, so variables are not available for gitiles filters for rendering.
Installing the filter on top of all is simplicity and guarantee that the
banner settings are available in all cases.
Change-Id: I1c1da5186f8215395f7ee991512052f337967559
Signed-off-by: Alon Bar-Lev <alon.barlev@gmail.com>
diff --git a/src/main/java/com/googlesource/gerrit/plugins/gitiles/HttpModule.java b/src/main/java/com/googlesource/gerrit/plugins/gitiles/HttpModule.java
index d91f831..fc459c4 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/gitiles/HttpModule.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/gitiles/HttpModule.java
@@ -20,7 +20,6 @@
import com.google.gitiles.GitilesAccess;
import com.google.gitiles.GitilesServlet;
import com.google.gitiles.GitilesUrls;
-import com.google.gitiles.GitilesView;
import com.google.inject.Inject;
import com.google.inject.Provider;
import com.google.inject.Provides;
@@ -92,6 +91,7 @@
// Filter all paths so we can decode escaped entities in the URI
filter("/*").through(createPathFilter());
filter("/*").through(new LoginFilter(userProvider, urls));
+ filter("/*").through(new MenuFilter(userProvider, urls));
// make this plugin's classloader the context classloader to prevent
// classloader issue when rendering markdown
@@ -108,14 +108,8 @@
@Named("gitiles") Config cfg,
GitilesUrls urls,
GitilesAccess.Factory accessFactory,
- RepositoryResolver<HttpServletRequest> resolver,
- MenuFilter menuFilter) {
- GitilesServlet s =
- new GitilesServlet(cfg, null, urls, accessFactory, resolver, null, null, null, null);
- for (GitilesView.Type view : GitilesView.Type.values()) {
- s.addFilter(view, menuFilter);
- }
- return s;
+ RepositoryResolver<HttpServletRequest> resolver) {
+ return new GitilesServlet(cfg, null, urls, accessFactory, resolver, null, null, null, null);
}
@Provides
