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

REFACTOR: Remove Discourse.SiteSettings from post model

Browse Source
This commit is contained in:
Robin Ward 2020-07-21 11:53:48 -04:00
parent 21ea4d1238
commit f6c40075e5
1 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
app/assets/javascripts/discourse/app/models/post.js
View File

@ -40,9 +40,7 @@ const Post = RestModel.extend({
@discourseComputed("name", "username") @discourseComputed("name", "username")
showName(name, username) { showName(name, username) {
return ( return name && name !== username && this.siteSettings.display_name_on_posts;
name && name !== username && Discourse.SiteSettings.display_name_on_posts
);
}, },
@discourseComputed("firstPost", "deleted_by", "topic.deleted_by") @discourseComputed("firstPost", "deleted_by", "topic.deleted_by")
@ -190,10 +188,7 @@ const Post = RestModel.extend({
this.set("oldCooked", this.cooked); this.set("oldCooked", this.cooked);
// Moderators can delete posts. Users can only trigger a deleted at message, unless delete_removed_posts_after is 0. // Moderators can delete posts. Users can only trigger a deleted at message, unless delete_removed_posts_after is 0.
if ( if (deletedBy.staff || this.siteSettings.delete_removed_posts_after === 0) {
deletedBy.staff ||
Discourse.SiteSettings.delete_removed_posts_after === 0
) {
this.setProperties({ this.setProperties({
deleted_at: new Date(), deleted_at: new Date(),
deleted_by: deletedBy, deleted_by: deletedBy,
@ -207,7 +202,7 @@ const Post = RestModel.extend({
: "post.deleted_by_author"; : "post.deleted_by_author";
promise = cookAsync( promise = cookAsync(
I18n.t(key, { I18n.t(key, {
count: Discourse.SiteSettings.delete_removed_posts_after count: this.siteSettings.delete_removed_posts_after
}) })
).then(cooked => { ).then(cooked => {
this.setProperties({ this.setProperties({