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]Wrong custom status displayed on room leader panel #14958

Merged
merged 2 commits into from
Jul 11, 2019
Merged

[FIX]Wrong custom status displayed on room leader panel #14958

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c252db5
Fixes display of custom status on the room leader information panel
pierre-lehnen-rc Jul 10, 2019
5082ce6
Fix space
sampaiodiego Jul 11, 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/ui/client/views/app/room.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@
<div class="leader-name">{{name}}</div>
<div class="leader-status userStatus">
<span class="color-ball status-bg-{{status}}"></span>
<span class="status-text leader-status-text">{{_ statusDisplay}}</span>
<span class="status-text leader-status-text">{{ statusDisplay}}</span>
</div>
<a class="chat-now" href="{{chatNowLink}}">{{_ "Chat_Now"}}</a>
</div>
Expand Down
2 changes: 1 addition & 1 deletion app/ui/client/views/app/room.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -321,7 +321,7 @@ Template.room.helpers({
...roles.u,
name: settings.get('UI_Use_Real_Name') ? roles.u.name || roles.u.username : roles.u.username,
status: leader.status || 'offline',
statusDisplay: leader.statusText || leader.status || 'offline',
statusDisplay: leader.statusText || t(leader.status || 'offline'),
};
}
},
Expand Down