github-mirror/discourse
github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-04-03 05:39:41 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

DEV: Don't eagerly find and assign Topic.category

Browse Source
This commit is contained in:
Jarek Radosz 2020-11-11 15:04:19 +01:00 committed by Robin Ward
parent 19b7cdd21f
commit cb4c9eeab8
3 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/assets/javascripts/discourse/app/controllers/topic-bulk-actions.js
View File

@ -241,11 +241,10 @@ export default Controller.extend(ModalFunctionality, {
changeCategory() { changeCategory() {
const categoryId = parseInt(this.newCategoryId, 10) || 0; const categoryId = parseInt(this.newCategoryId, 10) || 0;
const category = Category.findById(categoryId);
this.perform({ type: "change_category", category_id: categoryId }).then( this.perform({ type: "change_category", category_id: categoryId }).then(
(topics) => { (topics) => {
topics.forEach((t) => t.set("category", category)); topics.forEach((t) => t.set("category_id", categoryId));
(this.refreshClosure || identity)(); (this.refreshClosure || identity)();
this.send("closeModal"); this.send("closeModal");
} }

6
app/assets/javascripts/discourse/app/models/category-list.js
View File

@ -43,11 +43,7 @@ CategoryList.reopenClass({
} }
if (c.topics) { if (c.topics) {
c.topics = c.topics.map((t) => { c.topics = c.topics.map((t) => Topic.create(t));
const topic = Topic.create(t);
topic.set("category", c);
return topic;
});
} }
switch (statPeriod) { switch (statPeriod) {

7
app/assets/javascripts/discourse/app/models/topic-list.js
View File

@ -5,7 +5,6 @@ import { ajax } from "discourse/lib/ajax";
import RestModel from "discourse/models/rest"; import RestModel from "discourse/models/rest";
import { getOwner } from "discourse-common/lib/get-owner"; import { getOwner } from "discourse-common/lib/get-owner";
import { Promise } from "rsvp"; import { Promise } from "rsvp";
import Category from "discourse/models/category";
import Session from "discourse/models/session"; import Session from "discourse/models/session";
import { isEmpty } from "@ember/utils"; import { isEmpty } from "@ember/utils";
import User from "discourse/models/user"; import User from "discourse/models/user";
@ -156,12 +155,10 @@ TopicList.reopenClass({
// Stitch together our side loaded data // Stitch together our side loaded data
const categories = Category.list(), const users = extractByKey(result.users, User);
users = extractByKey(result.users, User), const groups = extractByKey(result.primary_groups, EmberObject);
groups = extractByKey(result.primary_groups, EmberObject);
return result.topic_list[listKey].map((t) => { return result.topic_list[listKey].map((t) => {
t.category = categories.findBy("id", t.category_id);
t.posters.forEach((p) => { t.posters.forEach((p) => {
p.user = users[p.user_id]; p.user = users[p.user_id];
p.extraClasses = p.extras; p.extraClasses = p.extras;