discourse/discourse
1
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-03-09 14:34:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

DEV: Avoid unnecessary site-settings:main lookups (#15006)

Browse Source
This commit is contained in:
Jarek Radosz 2021-11-18 17:11:59 +01:00 committed by GitHub
parent 8dc9e0f4bd
commit a102673522
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
app/assets/javascripts/admin/addon/services/admin-tools.js
View File

@ -1,8 +1,4 @@
import AdminUser from "admin/models/admin-user"; import AdminUser from "admin/models/admin-user";
// A service that can act as a bridge between the front end Discourse application
// and the admin application. Use this if you need front end code to access admin
// modules. Inject it optionally, and if it exists go to town!
import I18n from "I18n"; import I18n from "I18n";
import { Promise } from "rsvp"; import { Promise } from "rsvp";
import Service from "@ember/service"; import Service from "@ember/service";
@ -12,14 +8,10 @@ import { getOwner } from "discourse-common/lib/get-owner";
import { iconHTML } from "discourse-common/lib/icon-library"; import { iconHTML } from "discourse-common/lib/icon-library";
import showModal from "discourse/lib/show-modal"; import showModal from "discourse/lib/show-modal";
// A service that can act as a bridge between the front end Discourse application
// and the admin application. Use this if you need front end code to access admin
// modules. Inject it optionally, and if it exists go to town!
export default Service.extend({ export default Service.extend({
init() {
this._super(...arguments);
// TODO: Make `siteSettings` a service that can be injected
this.siteSettings = getOwner(this).lookup("site-settings:main");
},
showActionLogs(target, filters) { showActionLogs(target, filters) {
const controller = getOwner(target).lookup( const controller = getOwner(target).lookup(
"controller:adminLogs.staffActionLogs" "controller:adminLogs.staffActionLogs"

4
app/assets/javascripts/discourse/app/lib/keyboard-shortcuts.js
View File

@ -744,9 +744,7 @@ export default {
}, },
categoriesTopicsList() { categoriesTopicsList() {
const setting = this.container.lookup("site-settings:main") switch (this.siteSettings.desktop_category_page_style) {
.desktop_category_page_style;
switch (setting) {
case "categories_with_featured_topics": case "categories_with_featured_topics":
return $(".latest .featured-topic"); return $(".latest .featured-topic");
case "categories_and_latest_topics": case "categories_and_latest_topics":