From c3b83498a4111dc44e7996334d97f0893ad4e2b8 Mon Sep 17 00:00:00 2001
From: Angelina Filippova <linakirsanova@gmail.com>
Date: Wed, 19 Feb 2020 02:38:35 +0300
Subject: [PATCH] Move Tesla adaper to HTTP tab
---
src/views/settings/components/Http.vue | 10 ++++++++++
src/views/settings/components/Other.vue | 10 ----------
2 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/src/views/settings/components/Http.vue b/src/views/settings/components/Http.vue
index a94000b2..a12a1efa 100644
--- a/src/views/settings/components/Http.vue
+++ b/src/views/settings/components/Http.vue
@@ -3,6 +3,10 @@
<el-form ref="httpData" :model="httpData" :label-width="labelWidth">
<setting :setting-group="http" :data="httpData"/>
</el-form>
+ <el-form ref="teslaAdapter" :model="teslaAdapterData" :label-width="labelWidth">
+ <setting :setting-group="teslaAdapter" :data="teslaAdapterData"/>
+ </el-form>
+ <el-divider class="divider thick-line"/>
<el-form ref="corsPlugData" :model="corsPlugData" :label-width="labelWidth">
<el-form-item class="grouped-settings-header">
<span class="label-font">{{ $t('settings.corsPlug') }}</span>
@@ -82,6 +86,12 @@ export default {
loading() {
return this.settings.loading
},
+ teslaAdapter() {
+ return this.settings.description.find(setting => setting.group === ':tesla')
+ },
+ teslaAdapterData() {
+ return _.get(this.settings.settings, [':tesla']) || {}
+ },
webCacheTtl() {
return this.settings.description.find(setting => setting.key === ':web_cache_ttl')
},
diff --git a/src/views/settings/components/Other.vue b/src/views/settings/components/Other.vue
index d748c2da..4a3b465f 100644
--- a/src/views/settings/components/Other.vue
+++ b/src/views/settings/components/Other.vue
@@ -1,9 +1,5 @@
<template>
<div v-if="!loading" class="form-container">
- <el-form ref="teslaAdapter" :model="teslaAdapterData" :label-width="labelWidth">
- <setting :setting-group="teslaAdapter" :data="teslaAdapterData"/>
- </el-form>
- <el-divider class="divider thick-line"/>
<el-form ref="mimeTypes" :model="mimeTypesData" :label-width="labelWidth">
<setting :setting-group="mimeTypes" :data="mimeTypesData"/>
</el-form>
@@ -58,12 +54,6 @@ export default {
},
remoteIpData() {
return _.get(this.settings.settings, [':pleroma', 'Pleroma.Plugs.RemoteIp']) || {}
- },
- teslaAdapter() {
- return this.settings.description.find(setting => setting.group === ':tesla')
- },
- teslaAdapterData() {
- return _.get(this.settings.settings, [':tesla']) || {}
}
},
methods: {
--
GitLab