From 195a9dc771bb7b5d167ad68355c1e2e147b1d457 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E7=A5=A5=E8=B6=85?= Date: Sun, 14 Jan 2024 20:33:07 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=BD=91=E7=AB=99=E8=AE=BE?= =?UTF-8?q?=E7=BD=AE=E5=92=8C=E8=B7=AF=E7=94=B1=E8=AE=BE=E7=BD=AE=E4=B8=AD?= =?UTF-8?q?=E7=9A=84=E5=B7=A6=E4=BE=A7=E8=8F=9C=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../settings/locations/locationutils/location_helper.go | 5 +++-- .../web/actions/default/servers/serverutils/server_helper.go | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) 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 4df96f3d..3076d91b 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 @@ -130,8 +130,6 @@ func (this *LocationHelper) createMenus(serverIdString string, locationIdString "isOn": locationConfig != nil && locationConfig.Web != nil && locationConfig.Web.Compression != nil && locationConfig.Web.Compression.IsPrior, }) - menuItems = this.filterMenuItems3(locationConfig, menuItems, serverIdString, locationIdString, secondMenuItem, actionPtr) - menuItems = append(menuItems, maps.Map{ "name": this.Lang(actionPtr, codes.Server_MenuSettingPages), "url": "/servers/server/settings/locations/pages?serverId=" + serverIdString + "&locationId=" + locationIdString, @@ -156,6 +154,9 @@ func (this *LocationHelper) createMenus(serverIdString string, locationIdString "isActive": secondMenuItem == "webp", "isOn": locationConfig != nil && locationConfig.Web != nil && locationConfig.Web.WebP != nil && locationConfig.Web.WebP.IsPrior, }) + + menuItems = this.filterMenuItems3(locationConfig, menuItems, serverIdString, locationIdString, secondMenuItem, actionPtr) + menuItems = append(menuItems, maps.Map{ "name": this.Lang(actionPtr, codes.Server_MenuSettingStat), "url": "/servers/server/settings/locations/stat?serverId=" + serverIdString + "&locationId=" + locationIdString, diff --git a/internal/web/actions/default/servers/serverutils/server_helper.go b/internal/web/actions/default/servers/serverutils/server_helper.go index d10ef36f..710c6dfe 100644 --- a/internal/web/actions/default/servers/serverutils/server_helper.go +++ b/internal/web/actions/default/servers/serverutils/server_helper.go @@ -344,8 +344,6 @@ func (this *ServerHelper) createSettingsMenu(secondMenuItem string, serverIdStri "configCode": serverconfigs.ConfigCodeCompression, }) - menuItems = this.filterMenuItems3(serverConfig, menuItems, serverIdString, secondMenuItem, actionPtr) - menuItems = append(menuItems, maps.Map{ "name": this.Lang(actionPtr, codes.Server_MenuSettingPages), "url": "/servers/server/settings/pages?serverId=" + serverIdString, @@ -374,6 +372,8 @@ func (this *ServerHelper) createSettingsMenu(secondMenuItem string, serverIdStri "configCode": serverconfigs.ConfigCodeWebp, }) + menuItems = this.filterMenuItems3(serverConfig, menuItems, serverIdString, secondMenuItem, actionPtr) + menuItems = append(menuItems, maps.Map{ "name": this.Lang(actionPtr, codes.Server_MenuSettingStat), "url": "/servers/server/settings/stat?serverId=" + serverIdString,