kocoded/oqtane.framework
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'oqtane/dev' into dev

Browse Source
This commit is contained in:
Leigh Pointer 2023-07-18 12:37:53 +02:00
commit 9108eb5616
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Oqtane.Client/Services/ServiceBase.cs
View File

@ -66,7 +66,7 @@ namespace Oqtane.Services
// legacy support for ControllerRoutes.Default
if (alias != null)
{
// include the alias for multi-tenant context
// include the alias id for multi-tenant context
apiurl += $"{alias.AliasId}/";
}
else
@ -223,7 +223,7 @@ namespace Oqtane.Services
private async Task Log(string uri, string method, string status, string message, params object[] args)
{
if (_siteState.Alias != null)
if (_siteState.Alias != null && !uri.StartsWith(CreateApiUrl("Log")))
{
var log = new Log();
log.SiteId = _siteState.Alias.SiteId;

2
Oqtane.Server/Infrastructure/LogManager.cs
View File

@ -210,7 +210,7 @@ namespace Oqtane.Infrastructure
{
var subject = $"{alias.Name} Site {log.Level} Notification";
var url = $"{_accessor.HttpContext.Request.Scheme}://{alias.Name}/admin/log?id={log.LogId}";
string body = $"Log Message: {log.Message}\n\nPlease visit {url} for more information";
string body = $"Log Message: {log.Message}<br /><br />Please visit {url} for more information";
var notification = new Notification(log.SiteId.Value, userrole.User, subject, body);
_notifications.AddNotification(notification);
}