Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[FIX] Search message wrongly grouping messages #15094

Merged
merged 4 commits into from
Aug 20, 2019
Merged

[FIX] Search message wrongly grouping messages #15094

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0eca28a
Update message.js
ggazzo Aug 2, 2019
9c218a3
Merge branch 'develop' into save-rc-search
geekgonecrazy Aug 7, 2019
65b7d4d
Merge branch 'develop' into save-rc-search
ggazzo Aug 19, 2019
87e4f76
more views
ggazzo Aug 19, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/discussion/client/views/DiscussionTabbar.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ <h2>{{_ "No_discussions_yet"}}</h2>
<ul class="list clearfix">
{{# with messageContext}}
{{#each msg in messages}}
{{> nrr nrrargs 'message' msg=msg room=room subscription=subscription settings=settings u=u}}
{{> nrr nrrargs 'message' msg=msg room=room subscription=subscription groupable=false settings=settings u=u}}
{{/each}}
{{/with}}
</ul>
Expand Down
2 changes: 1 addition & 1 deletion app/mentions-flextab/client/views/mentionsFlexTab.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ <h2>{{_ "No_mentions_found"}}</h2>
<div class="flex-tab__result js-list">
<ul class="mentioned-messages-list list clearfix">
{{# with messageContext}}
{{#each msg in messages}}{{#nrr nrrargs 'message' msg=msg room=room subscription=subscription settings=settings u=u customClass="mentions" context="mentions"}}{{/nrr}}{{/each}}
{{#each msg in messages}}{{#nrr nrrargs 'message' groupable=false msg=msg room=room subscription=subscription settings=settings u=u customClass="mentions" context="mentions"}}{{/nrr}}{{/each}}
{{/with}}
</ul>
{{#if hasMore}}
Expand Down
2 changes: 1 addition & 1 deletion app/message-pin/client/views/pinnedMessages.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ <h2>{{_ "No_pinned_messages"}}</h2>
<div class="flex-tab__result pinned-messages-list js-list">
<ul class="list clearfix">
{{# with messageContext}}
{{#each msg in messages}}{{#nrr nrrargs 'message' msg=msg room=room subscription=subscription settings=settings u=u}}{{/nrr}}{{/each}}
{{#each msg in messages}}{{#nrr nrrargs 'message' msg=msg room=room groupable=false subscription=subscription settings=settings u=u}}{{/nrr}}{{/each}}
{{/with}}
</ul>

Expand Down
2 changes: 1 addition & 1 deletion app/message-star/client/views/starredMessages.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ <h2>{{_ "No_starred_messages"}}</h2>
<div class="flex-tab__result js-list">
<ul class="list clearfix">
{{# with messageContext}}
{{#each msg in messages}}{{#nrr nrrargs 'message' msg=msg room=room subscription=subscription settings=settings u=u}}{{/nrr}}{{/each}}
{{#each msg in messages}}{{#nrr nrrargs 'message' msg=msg room=room groupable=false subscription=subscription settings=settings u=u}}{{/nrr}}{{/each}}
{{/with}}
</ul>
{{#if hasMore}}
Expand Down
4 changes: 2 additions & 2 deletions app/ui-message/client/message.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -412,8 +412,8 @@ Template.message.helpers({
return msg.actionContext === 'snippeted';
},
isThreadReply() {
const { msg: { tmid, t }, settings: { showreply } } = this;
return !!(tmid && showreply && (!t || t === 'e2e'));
const { groupable, msg: { tmid, t, groupable: _groupable }, settings: { showreply } } = this;
return !(groupable || _groupable) && !!(tmid && showreply && (!t || t === 'e2e'));
},
collapsed() {
const { msg: { tmid, collapsed }, settings: { showreply }, shouldCollapseReplies } = this;
Expand Down