diff options
| author | MeiMei <30769358+mei23@users.noreply.github.com> | 2019-02-19 03:48:21 +0900 |
|---|---|---|
| committer | syuilo <Syuilotan@yahoo.co.jp> | 2019-02-19 03:48:21 +0900 |
| commit | f2d55e7f609ea8a0a78501500b5404d4a25539be (patch) | |
| tree | c5059263295d453d23fd74f5fe8fe51436bbbff6 /src | |
| parent | コンポーネント整理 (diff) | |
| download | sharkey-f2d55e7f609ea8a0a78501500b5404d4a25539be.tar.gz sharkey-f2d55e7f609ea8a0a78501500b5404d4a25539be.tar.bz2 sharkey-f2d55e7f609ea8a0a78501500b5404d4a25539be.zip | |
Fix #4308 (#4310)
Diffstat (limited to 'src')
| -rw-r--r-- | src/client/app/admin/views/instance.vue | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/src/client/app/admin/views/instance.vue b/src/client/app/admin/views/instance.vue index 36d885b065..ce3ce16f1c 100644 --- a/src/client/app/admin/views/instance.vue +++ b/src/client/app/admin/views/instance.vue @@ -54,9 +54,10 @@ <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-horizon-group> + <ui-switch v-model="smtpAuth">{{ $t('smtp-auth') }}</ui-switch> <ui-horizon-group inputs> - <ui-input v-model="smtpUser" :disabled="!enableEmail">{{ $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="smtpUser" :disabled="!enableEmail || !smtpAuth">{{ $t('smtp-user') }}</ui-input> + <ui-input v-model="smtpPass" type="password" :withPasswordToggle="true" :disabled="!enableEmail || !smtpAuth">{{ $t('smtp-pass') }}</ui-input> </ui-horizon-group> <ui-switch v-model="smtpSecure" :disabled="!enableEmail">{{ $t('smtp-secure') }}<template #desc>{{ $t('smtp-secure-info') }}</template></ui-switch> </section> @@ -188,6 +189,7 @@ export default Vue.extend({ smtpPort: null, smtpUser: null, smtpPass: null, + smtpAuth: false, enableServiceWorker: false, swPublicKey: null, swPrivateKey: null, @@ -236,6 +238,7 @@ export default Vue.extend({ this.smtpPort = meta.smtpPort; this.smtpUser = meta.smtpUser; this.smtpPass = meta.smtpPass; + this.smtpAuth = meta.smtpUser != null && meta.smtpUser !== ''; this.enableServiceWorker = meta.enableServiceWorker; this.swPublicKey = meta.swPublickey; this.swPrivateKey = meta.swPrivateKey; @@ -293,8 +296,8 @@ export default Vue.extend({ smtpSecure: this.smtpSecure, smtpHost: this.smtpHost, smtpPort: parseInt(this.smtpPort, 10), - smtpUser: this.smtpUser, - smtpPass: this.smtpPass, + smtpUser: this.smtpAuth ? this.smtpUser : '', + smtpPass: this.smtpAuth ? this.smtpPass : '', enableServiceWorker: this.enableServiceWorker, swPublicKey: this.swPublicKey, swPrivateKey: this.swPrivateKey |