mirror of
https://github.com/discourse/discourse.git
synced 2025-02-25 18:55:32 -06:00
DEV: Migrate sidebar site settings (#19336)
This new site setting replaces the `enable_experimental_sidebar_hamburger` and `enable_sidebar` site settings as the sidebar feature exits the experimental phase. Note that we're replacing this without depreciation since the previous site setting was considered experimental. Internal Ref: /t/86563
This commit is contained in:
committed by
GitHub
parent
f7f0ca801b
commit
fde9e6bc25
@@ -26,6 +26,6 @@ module UserSidebarTagsMixin
|
||||
end
|
||||
|
||||
def include_display_sidebar_tags?
|
||||
SiteSetting.tagging_enabled && SiteSetting.enable_experimental_sidebar_hamburger
|
||||
SiteSetting.tagging_enabled && !SiteSetting.legacy_navigation_menu?
|
||||
end
|
||||
end
|
||||
|
||||
@@ -258,7 +258,7 @@ class CurrentUserSerializer < BasicUserSerializer
|
||||
end
|
||||
|
||||
def include_sidebar_category_ids?
|
||||
SiteSetting.enable_experimental_sidebar_hamburger
|
||||
!SiteSetting.legacy_navigation_menu?
|
||||
end
|
||||
|
||||
def include_status?
|
||||
|
||||
@@ -243,7 +243,7 @@ class SiteSerializer < ApplicationSerializer
|
||||
end
|
||||
|
||||
def include_anonymous_default_sidebar_tags?
|
||||
scope.anonymous? && SiteSetting.enable_experimental_sidebar_hamburger && SiteSetting.tagging_enabled && SiteSetting.default_sidebar_tags.present?
|
||||
scope.anonymous? && !SiteSetting.legacy_navigation_menu? && SiteSetting.tagging_enabled && SiteSetting.default_sidebar_tags.present?
|
||||
end
|
||||
|
||||
private
|
||||
|
||||
Reference in New Issue
Block a user