Skip to content

Commit 3b055a9

Browse files
author
alirizaadiyahsi
authored
Merge pull request #354 from maliming/master
fix #353 SideBarUserArea needs to handle the case of not logging in.
2 parents 519be3c + 9b196b0 commit 3b055a9

File tree

1 file changed

+16
-13
lines changed
  • aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/Views/Shared/Components/SideBarUserArea

1 file changed

+16
-13
lines changed
Lines changed: 16 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,20 @@
11
@using AbpCompanyName.AbpProjectName.Web.Views.Shared.Components.SideBarUserArea
22
@model SideBarUserAreaViewModel
3-
<div class="user-info">
4-
<div class="image">
5-
<img src="~/images/user.png" width="48" height="48" alt="User" />
6-
</div>
7-
<div class="info-container">
8-
<div class="name" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">@Html.Raw(Model.GetShownLoginName())</div>
9-
<div class="email">@Model.LoginInformations.User.EmailAddress</div>
10-
<div class="btn-group user-helper-dropdown">
11-
<i class="material-icons" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true">keyboard_arrow_down</i>
12-
<ul class="dropdown-menu pull-right">
13-
<li><a href="@Url.Action("Logout", "Account", new { area= string.Empty })"><i class="material-icons">input</i>@L("Logout")</a></li>
14-
</ul>
3+
@if (Model.LoginInformations != null && Model.LoginInformations.User != null)
4+
{
5+
<div class="user-info">
6+
<div class="image">
7+
<img src="~/images/user.png" width="48" height="48" alt="User" />
8+
</div>
9+
<div class="info-container">
10+
<div class="name" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">@Html.Raw(Model.GetShownLoginName())</div>
11+
<div class="email">@Model.LoginInformations.User.EmailAddress</div>
12+
<div class="btn-group user-helper-dropdown">
13+
<i class="material-icons" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true">keyboard_arrow_down</i>
14+
<ul class="dropdown-menu pull-right">
15+
<li><a href="@Url.Action("Logout", "Account", new { area= string.Empty })"><i class="material-icons">input</i>@L("Logout")</a></li>
16+
</ul>
17+
</div>
1518
</div>
1619
</div>
17-
</div>
20+
}

0 commit comments

Comments
 (0)