github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2024-11-27 10:33:38 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

DEV: nav-item should not fail when no top menu items exist

Browse Source 
This can be called from themes where anonymous_top_menu_items is not set
cause the site requires login

Bail out cleanly if that is the case
This commit is contained in:
Sam Saffron 2019-12-04 10:30:04 +11:00
parent 2cca14d510
commit 57bb553499
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
app/assets/javascripts/discourse/models/nav-item.js.es6
View File

@ -150,11 +150,12 @@ NavItem.reopenClass({
opts = opts || {};
if (
anonymous &&
!Site.currentProp("anonymous_top_menu_items").includes(filterType)
)
return null;
if (anonymous) {
const topMenuItems = Site.currentProp("anonymous_top_menu_items");
if (!topMenuItems || !topMenuItems.includes(filterType)) {
return null;
}
}
if (!Category.list() && filterType === "categories") return null;
if (!Site.currentProp("top_menu_items").includes(filterType)) return null;