From e540f36a9acf2f9ed99c533b1d70c9885feb5839 Mon Sep 17 00:00:00 2001 From: Rish Date: Wed, 13 Nov 2019 09:18:26 +0530 Subject: [PATCH] Added new top-level bulk email settings no issue --- core/server/data/schema/default-settings.json | 7 ++++++- core/server/data/schema/schema.js | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/core/server/data/schema/default-settings.json b/core/server/data/schema/default-settings.json index b6bf44a517..622a309349 100644 --- a/core/server/data/schema/default-settings.json +++ b/core/server/data/schema/default-settings.json @@ -201,7 +201,12 @@ "defaultValue": "public" }, "members_subscription_settings": { - "defaultValue": "{\"mailgunApiKey\": \"\",\"mailgunDomain\": \"\",\"isPaid\":false,\"fromAddress\":\"noreply\",\"allowSelfSignup\":true,\"paymentProcessors\":[{\"adapter\":\"stripe\",\"config\":{\"secret_token\":\"\",\"public_token\":\"\",\"product\":{\"name\":\"Ghost Subscription\"},\"plans\":[{\"name\":\"Monthly\",\"currency\":\"usd\",\"interval\":\"month\",\"amount\":\"\"},{\"name\":\"Yearly\",\"currency\":\"usd\",\"interval\":\"year\",\"amount\":\"\"}]}}]}" + "defaultValue": "{\"isPaid\":false,\"fromAddress\":\"noreply\",\"allowSelfSignup\":true,\"paymentProcessors\":[{\"adapter\":\"stripe\",\"config\":{\"secret_token\":\"\",\"public_token\":\"\",\"product\":{\"name\":\"Ghost Subscription\"},\"plans\":[{\"name\":\"Monthly\",\"currency\":\"usd\",\"interval\":\"month\",\"amount\":\"\"},{\"name\":\"Yearly\",\"currency\":\"usd\",\"interval\":\"year\",\"amount\":\"\"}]}}]}" + } + }, + "bulk_email": { + "bulk_email_settings": { + "defaultValue": "{\"provider\":\"mailgun\", \"apiKey\": \"\", \"domain\": \"\", \"baseUrl\": \"\"}" } } } diff --git a/core/server/data/schema/schema.js b/core/server/data/schema/schema.js index bc04ef80e9..12489af828 100644 --- a/core/server/data/schema/schema.js +++ b/core/server/data/schema/schema.js @@ -152,7 +152,7 @@ module.exports = { maxlength: 50, nullable: false, defaultTo: 'core', - validations: {isIn: [['core', 'blog', 'theme', 'app', 'plugin', 'private', 'members']]} + validations: {isIn: [['core', 'blog', 'theme', 'app', 'plugin', 'private', 'members', 'bulk_email']]} }, created_at: {type: 'dateTime', nullable: false}, created_by: {type: 'string', maxlength: 24, nullable: false},