MirrorMirror
/
funkwhale
mirror of https://dev.funkwhale.audio/funkwhale/funkwhale.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix rendering instance settings

This commit is contained in:
wvffle 2022-07-19 01:29:43 +00:00 committed by Georg Krause
parent 57693d85fc
commit 58ef3757a4
4 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
front/.eslintrc.js
View File

@ -35,7 +35,6 @@ module.exports = {
'@typescript-eslint/no-unused-vars': 'off', '@typescript-eslint/no-unused-vars': 'off',
// TODO (wvffle): Migrate to pinia // TODO (wvffle): Migrate to pinia
// Vuex 3 store does not have types defined, hence we use `any`
'@typescript-eslint/no-explicit-any': 'off', '@typescript-eslint/no-explicit-any': 'off',
// TODO (wvffle): Migrate to <script setup> // TODO (wvffle): Migrate to <script setup>

2
front/src/components/admin/SettingsGroup.vue
View File

@ -144,8 +144,8 @@ const save = async () => {
</template> </template>
<content-form <content-form
v-if="setting.fieldType === 'markdown'" v-if="setting.fieldType === 'markdown'"
v-model="values[setting.identifier]"
v-bind="setting.fieldParams" v-bind="setting.fieldParams"
v-model="values[setting.identifier]"
/> />
<signup-form-builder <signup-form-builder
v-else-if="setting.fieldType === 'formBuilder'" v-else-if="setting.fieldType === 'formBuilder'"

5
front/src/components/admin/SignupFormBuilder.vue
View File

@ -103,6 +103,7 @@ const move = (idx: number, increment: number) => {
</translate> </translate>
</p> </p>
<content-form <content-form
v-if="value.help_text"
v-model="value.help_text.text" v-model="value.help_text.text"
field-id="help-text" field-id="help-text"
:permissive="true" :permissive="true"
@ -117,7 +118,7 @@ const move = (idx: number, increment: number) => {
Additional form fields to be displayed in the form. Only shown if manual sign-up validation is enabled. Additional form fields to be displayed in the form. Only shown if manual sign-up validation is enabled.
</translate> </translate>
</p> </p>
<table v-if="value.fields.length > 0"> <table v-if="value.fields?.length > 0">
<thead> <thead>
<tr> <tr>
<th> <th>
@ -206,7 +207,7 @@ const move = (idx: number, increment: number) => {
</table> </table>
<div class="ui hidden divider" /> <div class="ui hidden divider" />
<button <button
v-if="value.fields.length < maxFields" v-if="value.fields?.length < maxFields"
class="ui basic button" class="ui basic button"
@click.stop.prevent="addField" @click.stop.prevent="addField"
> >

8
front/src/views/admin/Settings.vue
View File

@ -1,8 +1,12 @@
<script setup lang="ts"> <script setup lang="ts">
import type { SettingsGroup } from '~/types' import type { SettingsGroup as SettingsGroupType } from '~/types'
import axios from 'axios' import axios from 'axios'
import $ from 'jquery' import $ from 'jquery'
import SettingsGroup from '~/components/admin/SettingsGroup.vue'
import { useCurrentElement } from '@vueuse/core' import { useCurrentElement } from '@vueuse/core'
import { ref, nextTick, onMounted, computed, watch } from 'vue' import { ref, nextTick, onMounted, computed, watch } from 'vue'
import { useRoute } from 'vue-router' import { useRoute } from 'vue-router'
@ -112,7 +116,7 @@ const groups = computed(() => [
{ name: 'instance__nodeinfo_private' } { name: 'instance__nodeinfo_private' }
] ]
} }
] as SettingsGroup[]) ] as SettingsGroupType[])
const labels = computed(() => ({ const labels = computed(() => ({
settings: $pgettext('Head/Admin/Title', 'Instance settings') settings: $pgettext('Head/Admin/Title', 'Instance settings')