Skip to content

[FIX] "User not found" for direct messages #16047

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

Merged
ggazzo merged 2 commits into from
Jan 6, 2020
Merged

[FIX] "User not found" for direct messages #16047

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8882118
changed user not found message
gabriellsh Dec 23, 2019
3a2c84d
code style fixes
gabriellsh Dec 23, 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
14 changes: 7 additions & 7 deletions app/ui/client/views/404/roomNotFound.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
<template name="roomNotFound">
<section class="page-container page-list content-background-color">
{{> header sectionName="Room_not_found"}}
<div class="content room-not-found error-color">
<i class="icon-attention"></i>
<div>
{{#with data}}
{{#with data}}
{{> header sectionName=headerMessage}}
<div class="content room-not-found error-color">
<i class="icon-attention"></i>
<div>
{{#if $eq type 'c'}}
{{{_ 'No_channel_with_name_%s_was_found' name}}}
{{/if}}
Expand All @@ -22,8 +22,8 @@
{{/if}}
{{/if}}
{{/if}}
{{/with}}
</div>
</div>
</div>
{{/with}}
</section>
</template>
5 changes: 5 additions & 0 deletions app/ui/client/views/404/roomNotFound.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,9 @@ Template.roomNotFound.helpers({
customErrorMessage() {
return this.error.reason;
},
headerMessage() {
const { type } = Template.currentData();

return type === 'd' ? 'User_not_found' : 'Room_not_found';
},
});