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

DEV: Refactor messages code to use `user.groupsWithMessages` function (#19189) 

Simplifies the template since we have one less conditional and one less
level of nesting
This commit is contained in:
Alan Guo Xiang Tan 2022-11-25 11:23:50 +08:00 committed by GitHub
parent bbcb69461f
commit 20715cd7f0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 22 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
app/assets/javascripts/discourse/app/templates/user/messages.hbs
View File

@ -54,36 +54,34 @@
</li>
{{/if}}
{{#each this.model.groups as |group|}}
{{#if group.has_messages}}
<li>
<LinkTo @route="userPrivateMessages.group" @model={{group.name}}>
{{d-icon "users"}}
{{capitalize-string group.name}}
</LinkTo>
</li>
{{#each this.model.groupsWithMessages as |group|}}
<li>
<LinkTo @route="userPrivateMessages.group" @model={{group.name}}>
{{d-icon "users"}}
{{capitalize-string group.name}}
</LinkTo>
</li>
{{#if (and this.isGroup (eq this.groupFilter group.name))}}
{{#if this.viewingSelf}}
<li class="archive">
<LinkTo @route="userPrivateMessages.groupNew" @model={{group.name}} class="new">
{{this.newLinkText}}
</LinkTo>
</li>
<li class="archive">
<LinkTo @route="userPrivateMessages.groupUnread" @model={{group.name}} class="unread">
{{this.unreadLinkText}}
</LinkTo>
</li>
{{/if}}
{{#if (and this.isGroup (eq this.groupFilter group.name))}}
{{#if this.viewingSelf}}
<li class="archive">
<LinkTo @route="userPrivateMessages.groupNew" @model={{group.name}} class="new">
{{this.newLinkText}}
</LinkTo>
</li>
<li class="archive">
<LinkTo @route="userPrivateMessages.groupArchive" @model={{group.name}}>
{{i18n "user.messages.archive"}}
<LinkTo @route="userPrivateMessages.groupUnread" @model={{group.name}} class="unread">
{{this.unreadLinkText}}
</LinkTo>
</li>
{{/if}}
<li class="archive">
<LinkTo @route="userPrivateMessages.groupArchive" @model={{group.name}}>
{{i18n "user.messages.archive"}}
</LinkTo>
</li>
{{/if}}
{{/each}}