Skip to content

Commit

Permalink
メールサーバーの設定がオフの場合はメール設定を表示しないように
Browse files Browse the repository at this point in the history
  • Loading branch information
syuilo committed Nov 29, 2018
1 parent 22e30b4 commit cf9f85e
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 7 deletions.
6 changes: 5 additions & 1 deletion src/client/app/common/views/components/profile-editor.vue
Expand Up @@ -67,7 +67,7 @@
</div>
</section>

<section>
<section v-if="enableEmail">
<header>{{ $t('email') }}</header>

<div>
Expand All @@ -94,6 +94,7 @@ export default Vue.extend({
data() {
return {
host: toUnicode(host),
enableEmail: false,
email: null,
name: null,
username: null,
Expand Down Expand Up @@ -128,6 +129,9 @@ export default Vue.extend({
},
created() {
this.$root.getMeta().then(meta => {
this.enableEmail = meta.enableEmail;
});
this.email = this.$store.state.i.email;
this.name = this.$store.state.i.name;
this.username = this.$store.state.i.username;
Expand Down
10 changes: 4 additions & 6 deletions src/server/api/endpoints/meta.ts
Expand Up @@ -66,16 +66,12 @@ export default define(meta, (ps, me) => new Promise(async (res, rej) => {
swPublickey: config.sw ? config.sw.public_key : null,
bannerUrl: instance.bannerUrl,
maxNoteTextLength: instance.maxNoteTextLength,

emojis: emojis,
enableEmail: instance.enableEmail,

enableTwitterIntegration: instance.enableTwitterIntegration,
enableGithubIntegration: instance.enableGithubIntegration,
enableDiscordIntegration: instance.enableDiscordIntegration,

enableExternalUserRecommendation: instance.enableExternalUserRecommendation,
externalUserRecommendationEngine: instance.externalUserRecommendationEngine,
externalUserRecommendationTimeout: instance.externalUserRecommendationTimeout
};

if (ps.detail) {
Expand Down Expand Up @@ -107,8 +103,10 @@ export default define(meta, (ps, me) => new Promise(async (res, rej) => {
response.githubClientSecret = instance.githubClientSecret;
response.discordClientId = instance.discordClientId;
response.discordClientSecret = instance.discordClientSecret;
response.enableExternalUserRecommendation = instance.enableExternalUserRecommendation;
response.externalUserRecommendationEngine = instance.externalUserRecommendationEngine;
response.externalUserRecommendationTimeout = instance.externalUserRecommendationTimeout;
response.summalyProxy = instance.summalyProxy;
response.enableEmail = instance.enableEmail;
response.email = instance.email;
response.smtpSecure = instance.smtpSecure;
response.smtpHost = instance.smtpHost;
Expand Down

0 comments on commit cf9f85e

Please sign in to comment.