github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-06-13 01:46:29 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

REFACTOR: Remove less effective method of injecting siteSettings

Browse Source
This commit is contained in:
Robin Ward
2020-07-14 13:07:54 -04:00
parent ca13160435
commit a37a19b55c
8 changed files with 55 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
test/javascripts/helpers/create-store.js
View File

@ -4,6 +4,7 @@ import KeyValueStore from "discourse/lib/key-value-store";
import TopicListAdapter from "discourse/adapters/topic-list";
import TopicTrackingState from "discourse/models/topic-tracking-state";
import { buildResolver } from "discourse-common/resolver";
import { currentSettings } from "helpers/site-settings";
const CatAdapter = RestAdapter.extend({
primaryKey: "cat_id"
@ -40,7 +41,7 @@ export default function(customLookup = () => {}) {
return this._tracker;
}
if (type === "site-settings:main") {
this._settings = this._settings || Discourse.SiteSettings;
this._settings = this._settings || currentSettings();
return this._settings;
}
return customLookup(type);