Skip to content

The Unified and Autonomous Development Platform

Do not display outline if no outline eligible symbols

robin shenb08c1eff8083
diff --git a/web/src/main/java/com/gitplex/server/web/page/project/blob/render/renderers/source/SourceViewPanel.java b/web/src/main/java/com/gitplex/server/web/page/project/blob/render/renderers/source/SourceViewPanel.java
index 8bb04aa44b..faeec5c545 100644
--- a/web/src/main/java/com/gitplex/server/web/page/project/blob/render/renderers/source/SourceViewPanel.java
+++ b/web/src/main/java/com/gitplex/server/web/page/project/blob/render/renderers/source/SourceViewPanel.java
@@ -195,7 +195,7 @@ public class SourceViewPanel extends BlobViewPanel implements Markable, SearchMe
@Override
public WebMarkupContainer newAdditionalActions(String id) {
WebMarkupContainer actions = new Fragment(id, "actionsFrag", this);
- if (!symbols.isEmpty()) {
+ if (hasOutline()) {
actions.add(new CheckBox("outline", Model.of(isOutlineVisibleInitially())).add(new OnChangeAjaxBehavior() {
@Override
@@ -727,7 +727,7 @@ public class SourceViewPanel extends BlobViewPanel implements Markable, SearchMe
}
private boolean isOutlineVisibleInitially() {
- if (!symbols.isEmpty()) {
+ if (hasOutline()) {
WebRequest request = (WebRequest) RequestCycle.get().getRequest();
Cookie cookie = request.getCookie(COOKIE_OUTLINE);
return cookie==null || !cookie.getValue().equals("no");
@@ -793,6 +793,14 @@ public class SourceViewPanel extends BlobViewPanel implements Markable, SearchMe
context.onCommentOpened(target, null);
}
+ private boolean hasOutline() {
+ for (Symbol symbol: symbols) {
+ if (symbol.isDisplayInOutline())
+ return true;
+ }
+ return false;
+ }
+
private List<Symbol> getChildSymbols(List<Symbol> symbols, @Nullable Symbol parentSymbol) {
List<Symbol> children = new ArrayList<>();
for (Symbol symbol: symbols) {
@@ -1129,7 +1137,7 @@ public class SourceViewPanel extends BlobViewPanel implements Markable, SearchMe
@Override
public List<MenuItem> getMenuItems(FloatingPanel dropdown) {
List<MenuItem> menuItems = new ArrayList<>();
- if (!symbols.isEmpty()) {
+ if (hasOutline()) {
menuItems.add(new MenuItem() {
@Override