From c90366ab05ef98f7b04308e951d3869fa1a59848 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Halil=20=C4=B0brahim=20Kalkan?= <hi_kalkan@yahoo.com>
Date: Wed, 27 Nov 2019 15:55:05 +0300
Subject: [PATCH] Should completely hide the tenant switch area if
 multi-tenancy is not enabled

---
 .../Themes/Basic/Layouts/Account.cshtml            | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Themes/Basic/Layouts/Account.cshtml b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Themes/Basic/Layouts/Account.cshtml
index 7b43c6d969..13d438441d 100644
--- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Themes/Basic/Layouts/Account.cshtml
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Themes/Basic/Layouts/Account.cshtml
@@ -53,11 +53,14 @@
     <div class="@containerClass">
         <abp-row>
             <abp-column size-md="_5" class="mx-auto">
+                @if (MultiTenancyOptions.Value.IsEnabled &&
+                    (TenantResolveResultAccessor.Result?.AppliedResolvers?.Contains(CookieTenantResolveContributor.ContributorName) == true))
+                { 
                 <div class="card shadow-sm rounded mb-3">
                     <div class="card-body px-5">
                         <div class="row">
                             <div class="col">
-                                <span style="font-size: .8em;" class="text-uppercase text-muted">@MultiTenancyStringLocalizer["Tenant"]</span><br />
+                                <span style="font-size: .8em;" class="text-uppercase text-muted">@MultiTenancyStringLocalizer["Tenant"]</span><br/>
                                 <h6 class="m-0 d-inline-block">
                                     @if (CurrentTenant.Id == null)
                                     {
@@ -72,15 +75,12 @@
                                 </h6>
                             </div>
                             <div class="col-auto">
-                                @if (MultiTenancyOptions.Value.IsEnabled &&
-                           (TenantResolveResultAccessor.Result?.AppliedResolvers?.Contains(CookieTenantResolveContributor.ContributorName) == true))
-                                { 
-                                    <a id="AbpTenantSwitchLink" href="javascript:;" class="btn btn-sm mt-3 btn-outline-primary">@MultiTenancyStringLocalizer["Switch"]</a> 
-                                }
+                                <a id="AbpTenantSwitchLink" href="javascript:;" class="btn btn-sm mt-3 btn-outline-primary">@MultiTenancyStringLocalizer["Switch"]</a>
                             </div>
                         </div>
-                    </div> 
+                    </div>
                 </div>
+                }
                 @(await Component.InvokeAsync<PageAlertsViewComponent>())
                 @RenderBody()
             </abp-column>