logo

pleroma-fe

My custom branche(s) on git.pleroma.social/pleroma/pleroma-fe git clone https://hacktivis.me/git/pleroma-fe.git
commit: 3781f0e3bf3f796772a42226bc2897eb0b3294b4
parent dbf14eee40bf6d7a4ce45605fc52c941013f7d4b
Author: HJ <30-hj@users.noreply.git.pleroma.social>
Date:   Sun, 12 Nov 2023 10:48:06 +0000

Merge branch 'cherry-pick-faef2767' into 'release/2.6.x'

Fix admin dashboard crashing for 2.6.1

See merge request pleroma/pleroma-fe!1868

Diffstat:

Achangelog.d/fix-admin-crash-when-no-primary-fe-set.fix1+
Msrc/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 @@ -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 @@ -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