logo

pleroma-fe

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

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

(cherry picked from commit faef2767cd7ba5961445e9c38e8ebf52d3610259)

661d5b6d Fix frontend admin tab crashing when no primary frontend is set
b2c5520d Add changelog for frontend tab crash fix

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