Elgato_dark/ToolJet
1
0
Fork 0
mirror of https://github.com/ToolJet/ToolJet synced 2026-05-23 00:48:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Fixed a bug that crashed dashboard

Browse source
This commit is contained in:
navaneeth 2021-05-25 21:03:17 +05:30
parent cf8f760409
commit c6923bd77f
2 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
frontend/src/ManageOrgUsers/ManageOrgUsers.jsx
View file

@ -240,7 +240,7 @@ class ManageOrgUsers extends React.Component {
{users.map((user) => (
<tr key={user.id}>
<td>
<span className="avatar bg-azure-lt avatar-sm">{user.first_name[0]}{user.last_name[0]}</span>
<span className="avatar bg-azure-lt avatar-sm">{user.first_name ? user.first_name[0]: ''}{user.last_name ? user.last_name[0] : ''}</span>
<span className="mx-3" style={{display: 'inline-flex', marginBottom: '7px'}}>{user.name}</span>
</td>
<td className="text-muted">

6
frontend/src/_components/Header.jsx
View file

@ -17,6 +17,8 @@ export const Header = function Header({
history.push('/login');
}
const { first_name, last_name } = authenticationService.currentUserValue;
return <header className="navbar navbar-expand-md navbar-light d-print-none">
<div className="container-xl">
<button className="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbar-menu">
@ -61,8 +63,8 @@ export const Header = function Header({
>
<div className="d-none d-xl-block ps-2">
<span class="avatar bg-azure-lt">
{authenticationService.currentUserValue.first_name[0]}
{authenticationService.currentUserValue.last_name[0]}
{first_name ? first_name[0] : ''}
{last_name ? last_name[0] : ''}
</span>
</div>
</a>