From 727ff183f44dea751f452512ff01ff64f1ec1bbf Mon Sep 17 00:00:00 2001
From: Katharina Irrgang <katharina.irrgang@googlemail.com>
Date: Fri, 21 Sep 2018 15:16:19 +0200
Subject: [PATCH] Normalised how we require models

refs #9866

- if I want to do a project search and looks for model usages e.g. `models.`, then I won't find these usages
- normalise how we require models -> consistency
---
 core/server/api/themes.js              |  4 ++--
 core/server/services/settings/index.js | 10 +++++-----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/core/server/api/themes.js b/core/server/api/themes.js
index c10b68dc6d..3cf18acf50 100644
--- a/core/server/api/themes.js
+++ b/core/server/api/themes.js
@@ -5,7 +5,7 @@ const debug = require('ghost-ignition').debug('api:themes'),
     fs = require('fs-extra'),
     localUtils = require('./utils'),
     common = require('../lib/common'),
-    settingsModel = require('../models/settings').Settings,
+    models = require('../models'),
     settingsCache = require('../services/settings/cache'),
     themeUtils = require('../services/themes'),
     themeList = themeUtils.list;
@@ -64,7 +64,7 @@ themes = {
             .then((_checkedTheme) => {
                 checkedTheme = _checkedTheme;
                 // We use the model, not the API here, as we don't want to trigger permissions
-                return settingsModel.edit(newSettings, options);
+                return models.Settings.edit(newSettings, options);
             })
             // Call activate
             .then(() => {
diff --git a/core/server/services/settings/index.js b/core/server/services/settings/index.js
index 8f5429af6b..5d304fedaf 100644
--- a/core/server/services/settings/index.js
+++ b/core/server/services/settings/index.js
@@ -3,12 +3,12 @@
  * A collection of utilities for handling settings including a cache
  */
 const _ = require('lodash'),
-    SettingsModel = require('../../models/settings').Settings,
+    debug = require('ghost-ignition').debug('services:settings:index'),
+    common = require('../../lib/common'),
+    models = require('../../models'),
     SettingsCache = require('./cache'),
     SettingsLoader = require('./loader'),
-    ensureSettingsFiles = require('./ensure-settings'),
-    common = require('../../lib/common'),
-    debug = require('ghost-ignition').debug('services:settings:index');
+    ensureSettingsFiles = require('./ensure-settings');
 
 module.exports = {
     init: function init() {
@@ -21,7 +21,7 @@ module.exports = {
         return ensureSettingsFiles(knownSettings)
             .then(() => {
                 // Update the defaults
-                return SettingsModel.populateDefaults();
+                return models.Settings.populateDefaults();
             })
             .then((settingsCollection) => {
                 // Initialise the cache with the result