natty
/
calckey
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix #4308 (#4310)

This commit is contained in:
MeiMei 2019-02-19 03:48:21 +09:00 committed by syuilo
parent 963b0db3d3
commit f2d55e7f60
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
locales/ja-JP.yml
View File

@ -1234,6 +1234,7 @@ admin/views/instance.vue:
smtp-secure-info: "STARTTLS使用時はオフにします。" smtp-secure-info: "STARTTLS使用時はオフにします。"
smtp-host: "SMTPホスト" smtp-host: "SMTPホスト"
smtp-port: "SMTPポート" smtp-port: "SMTPポート"
smtp-auth: "SMTP認証を行う"
smtp-user: "SMTPユーザー" smtp-user: "SMTPユーザー"
smtp-pass: "SMTPパスワード" smtp-pass: "SMTPパスワード"
serviceworker-config: "ServiceWorker" serviceworker-config: "ServiceWorker"

11
src/client/app/admin/views/instance.vue
View File

@ -54,9 +54,10 @@
<ui-input v-model="smtpHost" :disabled="!enableEmail">{{ $t('smtp-host') }}</ui-input> <ui-input v-model="smtpHost" :disabled="!enableEmail">{{ $t('smtp-host') }}</ui-input>
<ui-input v-model="smtpPort" type="number" :disabled="!enableEmail">{{ $t('smtp-port') }}</ui-input> <ui-input v-model="smtpPort" type="number" :disabled="!enableEmail">{{ $t('smtp-port') }}</ui-input>
</ui-horizon-group> </ui-horizon-group>
<ui-switch v-model="smtpAuth">{{ $t('smtp-auth') }}</ui-switch>
<ui-horizon-group inputs> <ui-horizon-group inputs>
<ui-input v-model="smtpUser" :disabled="!enableEmail">{{ $t('smtp-user') }}</ui-input> <ui-input v-model="smtpUser" :disabled="!enableEmail || !smtpAuth">{{ $t('smtp-user') }}</ui-input>
<ui-input v-model="smtpPass" type="password" :withPasswordToggle="true" :disabled="!enableEmail">{{ $t('smtp-pass') }}</ui-input> <ui-input v-model="smtpPass" type="password" :withPasswordToggle="true" :disabled="!enableEmail || !smtpAuth">{{ $t('smtp-pass') }}</ui-input>
</ui-horizon-group> </ui-horizon-group>
<ui-switch v-model="smtpSecure" :disabled="!enableEmail">{{ $t('smtp-secure') }}<template #desc>{{ $t('smtp-secure-info') }}</template></ui-switch> <ui-switch v-model="smtpSecure" :disabled="!enableEmail">{{ $t('smtp-secure') }}<template #desc>{{ $t('smtp-secure-info') }}</template></ui-switch>
</section> </section>
@ -188,6 +189,7 @@ export default Vue.extend({
smtpPort: null, smtpPort: null,
smtpUser: null, smtpUser: null,
smtpPass: null, smtpPass: null,
smtpAuth: false,
enableServiceWorker: false, enableServiceWorker: false,
swPublicKey: null, swPublicKey: null,
swPrivateKey: null, swPrivateKey: null,
@ -236,6 +238,7 @@ export default Vue.extend({
this.smtpPort = meta.smtpPort; this.smtpPort = meta.smtpPort;
this.smtpUser = meta.smtpUser; this.smtpUser = meta.smtpUser;
this.smtpPass = meta.smtpPass; this.smtpPass = meta.smtpPass;
this.smtpAuth = meta.smtpUser != null && meta.smtpUser !== '';
this.enableServiceWorker = meta.enableServiceWorker; this.enableServiceWorker = meta.enableServiceWorker;
this.swPublicKey = meta.swPublickey; this.swPublicKey = meta.swPublickey;
this.swPrivateKey = meta.swPrivateKey; this.swPrivateKey = meta.swPrivateKey;
@ -293,8 +296,8 @@ export default Vue.extend({
smtpSecure: this.smtpSecure, smtpSecure: this.smtpSecure,
smtpHost: this.smtpHost, smtpHost: this.smtpHost,
smtpPort: parseInt(this.smtpPort, 10), smtpPort: parseInt(this.smtpPort, 10),
smtpUser: this.smtpUser, smtpUser: this.smtpAuth ? this.smtpUser : '',
smtpPass: this.smtpPass, smtpPass: this.smtpAuth ? this.smtpPass : '',
enableServiceWorker: this.enableServiceWorker, enableServiceWorker: this.enableServiceWorker,
swPublicKey: this.swPublicKey, swPublicKey: this.swPublicKey,
swPrivateKey: this.swPrivateKey swPrivateKey: this.swPrivateKey