starred/1Panel
1
0
Fork 0
mirror of https://github.com/1Panel-dev/1Panel.git synced 2026-10-12 16:00:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev-v2' into pr@dev-v2@fix-cleanDockerNetwork

Browse Source
This commit is contained in:
guoyuqi
2026-09-24 14:09:56 +08:00
parent 381d71663c 4712ceaf2c
commit b498882708
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/middleware/demo_handle.go
+5
View File
@@ -27,6 +27,11 @@ var demoAllowedRoutes = map[demoRoute]struct{}{
{http.MethodPost, "/api/v2/toolbox/clam/base"}: {},
{http.MethodPost, "/api/v2/backups/record/size"}: {},
{http.MethodPost, "/api/v2/hosts/firewall/base"}: {},
{http.MethodPost, "/api/v2/hosts/firewall/forward/base"}: {},
{http.MethodPost, "/api/v2/hosts/firewall/rules/native/detail"}: {},
{http.MethodPost, "/api/v2/hosts/firewall/rules/sync/preview"}: {},
{http.MethodPost, "/api/v2/core/auth/login"}: {},
{http.MethodPost, "/api/v2/core/logs/login"}: {},
{http.MethodPost, "/api/v2/core/logs/operation"}: {},
frontend/src/routers/index.ts
+3 -2
View File
@@ -30,7 +30,8 @@ const clearLoginStatus = () => {
};
router.beforeEach(async (to, from) => {
const { entrance, isEnterprise, isEnterpriseLicenseLoaded, isEnterpriseLicensed, isLogin } = useGlobalStore();
const { entrance, isEnterprise, isEnterpriseLicenseLoaded, isEnterpriseLicensed, isLogin, isOnRestart } =
useGlobalStore();
NProgress.start();
axiosCanceler.removeAllPending();
@@ -88,7 +89,7 @@ router.beforeEach(async (to, from) => {
params: to.params,
};
}
if (!isEnterprise.value || isEnterpriseLicensed.value) {
if (!isEnterprise.value || (isEnterpriseLicensed.value && !isOnRestart.value)) {
NProgress.done();
return { name: 'home' };
}