github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-06-03 19:39:30 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FIX: Update sidebar to be navigation menu (#22101)

Browse Source 
Communities can use sidebar or header dropdown, therefore navigation menu is a better name settings in 2 places:

- Old user sidebar preferences;
- Site setting about default tags and categories.
This commit is contained in:
Krzysztof Kotlarek
2023-06-15 09:31:28 +10:00
committed by GitHub
parent be7d82d2b0
commit 2effcaa0f9
41 changed files with 171 additions and 144 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/models/user.rb
View File

@ -2065,8 +2065,8 @@ class User < ActiveRecord::Base
return if SiteSetting.legacy_navigation_menu?
return if staged? || bot?
if SiteSetting.default_sidebar_categories.present?
categories_to_update = SiteSetting.default_sidebar_categories.split("|")
if SiteSetting.default_navigation_menu_categories.present?
categories_to_update = SiteSetting.default_navigation_menu_categories.split("|")
if update
filtered_default_category_ids =
@ -2084,8 +2084,8 @@ class User < ActiveRecord::Base
)
end
if SiteSetting.tagging_enabled && SiteSetting.default_sidebar_tags.present?
tags_to_update = SiteSetting.default_sidebar_tags.split("|")
if SiteSetting.tagging_enabled && SiteSetting.default_navigation_menu_tags.present?
tags_to_update = SiteSetting.default_navigation_menu_tags.split("|")
if update
default_tag_ids = Tag.where(name: tags_to_update).pluck(:id)