Browse Source

Optimize AppUrlProvider: get current tenant only if needed.

pull/5399/head
Halil İbrahim Kalkan 6 years ago
parent
commit
2055db30fa
  1. 17
      framework/src/Volo.Abp.UI.Navigation/Volo/Abp/Ui/Navigation/Urls/AppUrlProvider.cs

17
framework/src/Volo.Abp.UI.Navigation/Volo/Abp/Ui/Navigation/Urls/AppUrlProvider.cs

@ -87,13 +87,16 @@ namespace Volo.Abp.UI.Navigation.Urls
tenantNamePlaceHolder = TenantNamePlaceHolder + '.';
}
if (CurrentTenant.Id.HasValue)
if (url.Contains(tenantNamePlaceHolder))
{
url = url.Replace(tenantNamePlaceHolder, await GetCurrentTenantNameAsync());
}
else
{
url = url.Replace(tenantNamePlaceHolder, "");
if (CurrentTenant.Id.HasValue)
{
url = url.Replace(tenantNamePlaceHolder, await GetCurrentTenantNameAsync());
}
else
{
url = url.Replace(tenantNamePlaceHolder, "");
}
}
return url;
@ -110,4 +113,4 @@ namespace Volo.Abp.UI.Navigation.Urls
return CurrentTenant.Name;
}
}
}
}

Loading…
Cancel
Save