Added new top-level bulk email settings

no issue
TryGhost · Nov 13, 2019 · 45bb968 · 45bb968
1 parent 2fd85c8
commit 45bb968
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 2 deletions.
diff --git a/app/models/setting.js b/app/models/setting.js
@@ -38,5 +38,6 @@ export default Model.extend(ValidationEngine, {
     twitterImage: attr('string'),
     ogTitle: attr('string'),
     ogDescription: attr('string'),
-    ogImage: attr('string')
+    ogImage: attr('string'),
+    bulkEmailSettings: attr('json-string')
 });
diff --git a/app/services/settings.js b/app/services/settings.js
@@ -27,7 +27,7 @@ export default Service.extend(_ProxyMixin, ValidationEngine, {
     _loadSettings() {
         if (!this._loadingPromise) {
             this._loadingPromise = this.store
-                .queryRecord('setting', {type: 'blog,theme,private,members'})
+                .queryRecord('setting', {type: 'blog,theme,private,members,bulk_email'})
                 .then((settings) => {
                     this._loadingPromise = null;
                     return settings;

diff --git a/mirage/fixtures/settings.js b/mirage/fixtures/settings.js
@@ -182,5 +182,15 @@ export default [
         created_by: 1,
         updated_at: '2019-10-09T09:49:00.000Z',
         updated_by: 1
+    },
+    {
+        id: 24,
+        type: 'bulk_email',
+        key: 'bulk_email_settings',
+        value: '{"provider":"mailgun","apiKey":"","domain":"","baseUrl":""}',
+        created_at: '2019-10-09T09:49:00.000Z',
+        created_by: 1,
+        updated_at: '2019-10-09T09:49:00.000Z',
+        updated_by: 1
     }
 ];