Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

FIX: failing build with prettier (#8241)

This commit is contained in:
Mark VanLandingham 2019-10-24 10:16:12 -05:00 committed by GitHub
parent da5e9af10a
commit 9592ab57e0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/assets/javascripts/discourse/routes/build-private-messages-route.js.es6
View File

@ -22,7 +22,9 @@ export default (viewName, path, channel) => {
const filter =
"topics/" + path + "/" + this.modelFor("user").get("username_lower");
const lastTopicList = findOrResetCachedTopicList(this.session, filter);
return lastTopicList ? lastTopicList : this.store.findFiltered("topicList", { filter });
return lastTopicList
? lastTopicList
: this.store.findFiltered("topicList", { filter });
},
setupController() {

7
app/assets/javascripts/discourse/routes/user-private-messages-group-archive.js.es6
View File

@ -17,10 +17,11 @@ export default createPMRoute("groups", "private-messages-groups").extend({
model(params) {
const username = this.modelFor("user").get("username_lower");
const filter =
`topics/private-messages-group/${username}/${params.name}/archive`;
const filter = `topics/private-messages-group/${username}/${params.name}/archive`;
const lastTopicList = findOrResetCachedTopicList(this.session, filter);
return lastTopicList ? lastTopicList : this.store.findFiltered("topicList", { filter });
return lastTopicList
? lastTopicList
: this.store.findFiltered("topicList", { filter });
},
afterModel(model) {

7
app/assets/javascripts/discourse/routes/user-private-messages-group.js.es6
View File

@ -12,10 +12,11 @@ export default createPMRoute("groups", "private-messages-groups").extend({
model(params) {
const username = this.modelFor("user").get("username_lower");
const filter =
`topics/private-messages-group/${username}/${params.name}`;
const filter = `topics/private-messages-group/${username}/${params.name}`;
const lastTopicList = findOrResetCachedTopicList(this.session, filter);
return lastTopicList ? lastTopicList : this.store.findFiltered("topicList", { filter });
return lastTopicList
? lastTopicList
: this.store.findFiltered("topicList", { filter });
},
afterModel(model) {