From 5e80039587c114f0ae5f01cc396c80c858a84bd8 Mon Sep 17 00:00:00 2001
From: Kevin Ansfield <kevin@lookingsideways.co.uk>
Date: Fri, 13 May 2016 12:24:17 +0200
Subject: [PATCH] Fix loss of private settings when saving in certain
 circumstances

no issue
- always ensure we load a full settings object so that we don't risk saving a partial settings object back to the server
- should fix the issues reported in Slack of disappearing private settings over time
---
 core/client/app/routes/settings/code-injection.js | 2 +-
 core/client/app/routes/settings/labs.js           | 2 +-
 core/client/app/routes/settings/navigation.js     | 2 +-
 core/client/app/services/feature.js               | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/core/client/app/routes/settings/code-injection.js b/core/client/app/routes/settings/code-injection.js
index 0c23163e0a..b293ad41bd 100644
--- a/core/client/app/routes/settings/code-injection.js
+++ b/core/client/app/routes/settings/code-injection.js
@@ -14,7 +14,7 @@ export default AuthenticatedRoute.extend(styleBody, CurrentUserSettings, {
     },
 
     model() {
-        return this.store.query('setting', {type: 'blog,theme'}).then((records) => {
+        return this.store.query('setting', {type: 'blog,theme,private'}).then((records) => {
             return records.get('firstObject');
         });
     },
diff --git a/core/client/app/routes/settings/labs.js b/core/client/app/routes/settings/labs.js
index f3595a2108..0facca73d3 100644
--- a/core/client/app/routes/settings/labs.js
+++ b/core/client/app/routes/settings/labs.js
@@ -15,7 +15,7 @@ export default AuthenticatedRoute.extend(styleBody, CurrentUserSettings, {
     },
 
     model() {
-        return this.store.query('setting', {type: 'blog,theme'}).then((records) => {
+        return this.store.query('setting', {type: 'blog,theme,private'}).then((records) => {
             return records.get('firstObject');
         });
     }
diff --git a/core/client/app/routes/settings/navigation.js b/core/client/app/routes/settings/navigation.js
index 06875e7bf9..dca80d7b94 100644
--- a/core/client/app/routes/settings/navigation.js
+++ b/core/client/app/routes/settings/navigation.js
@@ -17,7 +17,7 @@ export default AuthenticatedRoute.extend(styleBody, CurrentUserSettings, {
     },
 
     model() {
-        return this.store.query('setting', {type: 'blog,theme'}).then((records) => {
+        return this.store.query('setting', {type: 'blog,theme,private'}).then((records) => {
             return records.get('firstObject');
         });
     },
diff --git a/core/client/app/services/feature.js b/core/client/app/services/feature.js
index 8968c9fb54..fca3ef705a 100644
--- a/core/client/app/services/feature.js
+++ b/core/client/app/services/feature.js
@@ -46,7 +46,7 @@ export default Service.extend({
     }),
 
     fetch() {
-        return this.get('store').queryRecord('setting', {type: 'blog'}).then((settings) => {
+        return this.get('store').queryRecord('setting', {type: 'blog,theme,private'}).then((settings) => {
             this.set('_settings', settings);
             return true;
         });