From a190ef2c562da20f4e9050734acc25d51cd5ca0a Mon Sep 17 00:00:00 2001 From: Henry Jameson Date: Sun, 19 Nov 2023 10:02:42 +0200 Subject: [PATCH 1/2] fix crash added in this MR --- src/components/settings_modal/admin_tabs/frontends_tab.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/settings_modal/admin_tabs/frontends_tab.vue b/src/components/settings_modal/admin_tabs/frontends_tab.vue index 9f522f7f3..d2855ffbc 100644 --- a/src/components/settings_modal/admin_tabs/frontends_tab.vue +++ b/src/components/settings_modal/admin_tabs/frontends_tab.vue @@ -135,8 +135,8 @@ class="button button-default btn" type="button" :disabled=" - adminDraft[':pleroma'][':frontends'][':primary'].name === frontend.name && - adminDraft[':pleroma'][':frontends'][':primary'].ref === frontend.refs[0] + adminDraft[':pleroma'][':frontends'][':primary']?.name === frontend.name && + adminDraft[':pleroma'][':frontends'][':primary']?.ref === frontend.refs[0] " @click="setDefault(frontend)" > From 1037a3bb72ab0eba1d2dc352f2ea8e85e4df4fb5 Mon Sep 17 00:00:00 2001 From: Henry Jameson Date: Sun, 19 Nov 2023 10:06:06 +0200 Subject: [PATCH 2/2] remove the WIP tip since pleroma!3862 is in stable --- src/components/settings_modal/admin_tabs/frontends_tab.vue | 1 - src/i18n/en.json | 1 - src/i18n/zh.json | 1 - 3 files changed, 3 deletions(-) diff --git a/src/components/settings_modal/admin_tabs/frontends_tab.vue b/src/components/settings_modal/admin_tabs/frontends_tab.vue index d2855ffbc..dd4c9790a 100644 --- a/src/components/settings_modal/admin_tabs/frontends_tab.vue +++ b/src/components/settings_modal/admin_tabs/frontends_tab.vue @@ -10,7 +10,6 @@
  • {{ $t('admin_dash.frontend.default_frontend') }}

    {{ $t('admin_dash.frontend.default_frontend_tip') }}

    -

    {{ $t('admin_dash.frontend.default_frontend_tip2') }}

    • diff --git a/src/i18n/en.json b/src/i18n/en.json index 5352c1611..6bb9e4bba 100644 --- a/src/i18n/en.json +++ b/src/i18n/en.json @@ -914,7 +914,6 @@ "wip_notice": "Please note that this section is a WIP and lacks certain features as backend implementation of front-end management is incomplete.", "default_frontend": "Default front-end", "default_frontend_tip": "Default front-end will be shown to all users. Currently there's no way to for a user to select personal front-end. If you switch away from PleromaFE you'll most likely have to use old and buggy AdminFE to do instance configuration until we replace it.", - "default_frontend_tip2": "WIP: Since Pleroma backend doesn't properly list all installed frontends you'll have to enter name and reference manually. List below provides shortcuts to fill the values.", "available_frontends": "Available for install", "failure_installing_frontend": "Failed to install frontend {version}: {reason}", "success_installing_frontend": "Frontend {version} successfully installed" diff --git a/src/i18n/zh.json b/src/i18n/zh.json index 69266caa7..20cad1cb9 100644 --- a/src/i18n/zh.json +++ b/src/i18n/zh.json @@ -1266,7 +1266,6 @@ "wip_notice": "请注意,此部分是一个WIP,缺乏某些功能,因为前端管理的后台实现并不完整。", "default_frontend": "默认前端", "default_frontend_tip": "默认的前端将显示给所有用户。目前还没有办法让用户选择个人的前端。如果你不使用 PleromaFE,你很可能不得不使用旧的和有问题的 AdminFE 来进行实例配置,直到我们替换它。", - "default_frontend_tip2": "WIP: 由于 Pleroma 后端没有正确列出所有已安装的前端,你必须手动输入名称和引用。下面的列表提供了填写这些值的快捷方式。", "available_frontends": "可供安装" }, "temp_overrides": {