diff --git a/ghost/admin/app/index.html b/ghost/admin/app/index.html index 1b3d24e432..fddadc8673 100644 --- a/ghost/admin/app/index.html +++ b/ghost/admin/app/index.html @@ -31,13 +31,13 @@ - {{#each configuration}} - + {{#each configuration as |config key|}} + {{/each}} - {{#unless skip_google_fonts}} + {{#if configuration.useGoogleFonts.value}} - {{/unless}} + {{/if}} diff --git a/ghost/admin/app/routes/about.js b/ghost/admin/app/routes/about.js index f20db7a353..36a7a9bc4f 100644 --- a/ghost/admin/app/routes/about.js +++ b/ghost/admin/app/routes/about.js @@ -18,7 +18,7 @@ export default AuthenticatedRoute.extend(styleBody, { model() { let cachedConfig = this.get('cachedConfig'); - let configUrl = this.get('ghostPaths.url').api('configuration'); + let configUrl = this.get('ghostPaths.url').api('configuration', 'about'); if (cachedConfig) { return cachedConfig; @@ -26,12 +26,8 @@ export default AuthenticatedRoute.extend(styleBody, { return this.get('ajax').request(configUrl) .then((configurationResponse) => { - let configKeyValues = configurationResponse.configuration; + let [cachedConfig] = configurationResponse.configuration; - cachedConfig = {}; - configKeyValues.forEach((configKeyValue) => { - cachedConfig[configKeyValue.key] = configKeyValue.value; - }); this.set('cachedConfig', cachedConfig); return cachedConfig;