From 1b74c3ebe0026218fca9a86cb64d76f6b4992737 Mon Sep 17 00:00:00 2001 From: GoEdgeLab Date: Sat, 19 Jun 2021 22:20:15 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=95=8C=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../server/settings/locations/locationutils/location_helper.go | 3 ++- .../web/actions/default/servers/serverutils/server_helper.go | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/internal/web/actions/default/servers/server/settings/locations/locationutils/location_helper.go b/internal/web/actions/default/servers/server/settings/locations/locationutils/location_helper.go index 954d9b5c..0c7737f7 100644 --- a/internal/web/actions/default/servers/server/settings/locations/locationutils/location_helper.go +++ b/internal/web/actions/default/servers/server/settings/locations/locationutils/location_helper.go @@ -100,12 +100,13 @@ func (this *LocationHelper) createMenus(serverIdString string, locationIdString "name": "缓存", "url": "/servers/server/settings/locations/cache?serverId=" + serverIdString + "&locationId=" + locationIdString, "isActive": secondMenuItem == "cache", - "isOn": locationConfig != nil && locationConfig.Web != nil && locationConfig.Web.Cache != nil && locationConfig.Web.Cache.IsOn && len(locationConfig.Web.Cache.CacheRefs) > 0, + "isOn": locationConfig != nil && locationConfig.Web != nil && locationConfig.Web.Cache != nil && locationConfig.Web.Cache.IsPrior && locationConfig.Web.Cache.IsOn && len(locationConfig.Web.Cache.CacheRefs) > 0, }) menuItems = append(menuItems, maps.Map{ "name": "访问控制", "url": "/servers/server/settings/locations/access?serverId=" + serverIdString + "&locationId=" + locationIdString, "isActive": secondMenuItem == "access", + "isOn": locationConfig != nil && locationConfig.Web != nil && locationConfig.Web.Auth != nil && locationConfig.Web.Auth.IsPrior, }) menuItems = append(menuItems, maps.Map{ "name": "字符编码", diff --git a/internal/web/actions/default/servers/serverutils/server_helper.go b/internal/web/actions/default/servers/serverutils/server_helper.go index 76e27dd7..7c835f6a 100644 --- a/internal/web/actions/default/servers/serverutils/server_helper.go +++ b/internal/web/actions/default/servers/serverutils/server_helper.go @@ -275,6 +275,7 @@ func (this *ServerHelper) createSettingsMenu(secondMenuItem string, serverIdStri "name": "访问控制", "url": "/servers/server/settings/access?serverId=" + serverIdString, "isActive": secondMenuItem == "access", + "isOn": serverConfig.Web != nil && serverConfig.Web.Auth != nil && serverConfig.Web.Auth.IsOn, }) menuItems = append(menuItems, maps.Map{ "name": "字符编码",