diff options
| author | kakkokari-gtyih <67428053+kakkokari-gtyih@users.noreply.github.com> | 2023-03-19 20:28:19 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-03-19 20:28:19 +0900 |
| commit | 866aded6bcdd44e19f55bc4c9bf4aa0a8a67f530 (patch) | |
| tree | 5e6458e3b77f9d7ff70ccaf96f96df4c675abeb2 | |
| parent | fix(backend/URLPreviewService): エラーでHTTP 422を出すように (#10339) (diff) | |
| download | sharkey-866aded6bcdd44e19f55bc4c9bf4aa0a8a67f530.tar.gz sharkey-866aded6bcdd44e19f55bc4c9bf4aa0a8a67f530.tar.bz2 sharkey-866aded6bcdd44e19f55bc4c9bf4aa0a8a67f530.zip | |
fix: PC版設定ページでスマホ用UIが表示されるのを防ぐリダイレクトを追加 (#10326)
* (Fix misskey-dev#10324)設定画面:PC版UIへのリダイレクトをルート遷移時にも実行
* Update changelog
* (fix) missing semicolon
* (fix) strict equals
| -rw-r--r-- | CHANGELOG.md | 1 | ||||
| -rw-r--r-- | packages/frontend/src/pages/admin/index.vue | 8 | ||||
| -rw-r--r-- | packages/frontend/src/pages/settings/index.vue | 8 |
3 files changed, 15 insertions, 2 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 66b2d50dc0..d7a6814049 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -59,6 +59,7 @@ - リテンション分析が上手く機能しないことがあるのを修正 - 空のアンテナが作成できないように修正 - 特定の条件で通報が見れない問題を修正 +- PC版にて「設定」「コントロールパネル」のリンクを2度以上続けてクリックした際に空白のページが表示される問題を修正 ## 13.9.2 (2023/03/06) diff --git a/packages/frontend/src/pages/admin/index.vue b/packages/frontend/src/pages/admin/index.vue index 550de24bb2..8aae39cba1 100644 --- a/packages/frontend/src/pages/admin/index.vue +++ b/packages/frontend/src/pages/admin/index.vue @@ -12,7 +12,7 @@ <MkInfo v-if="noBotProtection" warn class="info">{{ i18n.ts.noBotProtectionWarning }} <MkA to="/admin/security" class="_link">{{ i18n.ts.configure }}</MkA></MkInfo> <MkInfo v-if="noEmailServer" warn class="info">{{ i18n.ts.noEmailServerWarning }} <MkA to="/admin/email-settings" class="_link">{{ i18n.ts.configure }}</MkA></MkInfo> - <MkSuperMenu :def="menuDef" :grid="currentPage?.route.name == null"></MkSuperMenu> + <MkSuperMenu :def="menuDef" :grid="narrow"></MkSuperMenu> </div> </MkSpacer> </div> @@ -220,6 +220,12 @@ onUnmounted(() => { ro.disconnect(); }); +watch(router.currentRef, (to) => { + if (to.route.path === "/admin" && to.child?.route.name == null && !narrow) { + router.replace('/admin/overview'); + } +}); + provideMetadataReceiver((info) => { if (info == null) { childInfo = null; diff --git a/packages/frontend/src/pages/settings/index.vue b/packages/frontend/src/pages/settings/index.vue index f1a450e18e..ae36466eec 100644 --- a/packages/frontend/src/pages/settings/index.vue +++ b/packages/frontend/src/pages/settings/index.vue @@ -7,7 +7,7 @@ <div v-if="!narrow || currentPage?.route.name == null" class="nav"> <div class="baaadecd"> <MkInfo v-if="emailNotConfigured" warn class="info">{{ i18n.ts.emailNotConfiguredWarning }} <MkA to="/settings/email" class="_link">{{ i18n.ts.configure }}</MkA></MkInfo> - <MkSuperMenu :def="menuDef" :grid="currentPage?.route.name == null"></MkSuperMenu> + <MkSuperMenu :def="menuDef" :grid="narrow"></MkSuperMenu> </div> </div> <div v-if="!(narrow && currentPage?.route.name == null)" class="main"> @@ -230,6 +230,12 @@ onUnmounted(() => { ro.disconnect(); }); +watch(router.currentRef, (to) => { + if (to.route.name === "settings" && to.child?.route.name == null && !narrow) { + router.replace('/settings/profile'); + } +}); + const emailNotConfigured = computed(() => instance.enableEmail && ($i.email == null || !$i.emailVerified)); provideMetadataReceiver((info) => { |