aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHJ <30-hj@users.noreply.git.pleroma.social>2023-11-12 10:38:13 +0000
committerHJ <30-hj@users.noreply.git.pleroma.social>2023-11-12 10:38:13 +0000
commitfaef2767cd7ba5961445e9c38e8ebf52d3610259 (patch)
treeee4a17b6986f1f6cbe6ebe1a177fabc347092019
parentc3c233c6fe8291bc4d691250144fb6a65e7de594 (diff)
parentb2c5520d337f313f4824186578428c2ed1d13b61 (diff)
Merge branch 'tusooa/fix-admin-crash-when-no-primary-fe-set' into 'develop'
fix admin crash when no primary fe set See merge request pleroma/pleroma-fe!1867
-rw-r--r--changelog.d/fix-admin-crash-when-no-primary-fe-set.fix1
-rw-r--r--src/components/settings_modal/admin_tabs/frontends_tab.vue4
2 files changed, 3 insertions, 2 deletions
diff --git a/changelog.d/fix-admin-crash-when-no-primary-fe-set.fix b/changelog.d/fix-admin-crash-when-no-primary-fe-set.fix
new file mode 100644
index 00000000..78eae3be
--- /dev/null
+++ b/changelog.d/fix-admin-crash-when-no-primary-fe-set.fix
@@ -0,0 +1 @@
+Fix frontend admin tab crashing when no primary frontend is set
diff --git a/src/components/settings_modal/admin_tabs/frontends_tab.vue b/src/components/settings_modal/admin_tabs/frontends_tab.vue
index 13b8fa6b..25b08eb7 100644
--- a/src/components/settings_modal/admin_tabs/frontends_tab.vue
+++ b/src/components/settings_modal/admin_tabs/frontends_tab.vue
@@ -33,9 +33,9 @@
>
<strong>{{ frontend.name }}</strong>
{{ ' ' }}
- <span v-if="adminDraft[':pleroma'][':frontends'][':primary'].name === frontend.name">
+ <span v-if="adminDraft[':pleroma'][':frontends'][':primary']?.name === frontend.name">
<i18n-t
- v-if="adminDraft[':pleroma'][':frontends'][':primary'].ref === frontend.refs[0]"
+ v-if="adminDraft[':pleroma'][':frontends'][':primary']?.ref === frontend.refs[0]"
keypath="admin_dash.frontend.is_default"
/>
<i18n-t