diff --git a/Oqtane.Client/Modules/Admin/Logs/Index.razor b/Oqtane.Client/Modules/Admin/Logs/Index.razor index 0dec8445..d2af52a0 100644 --- a/Oqtane.Client/Modules/Admin/Logs/Index.razor +++ b/Oqtane.Client/Modules/Admin/Logs/Index.razor @@ -1,15 +1,12 @@ @namespace Oqtane.Modules.Admin.Logs @inherits ModuleBase +@inject NavigationManager NavigationManager @inject ILogService LogService @inject ISettingService SettingService @inject IStringLocalizer Localizer @inject IStringLocalizer SharedLocalizer -@if (_id > 0) -{ - -} -else if (_logs == null) +@if (_logs == null) {

@SharedLocalizer["Loading"]

} @@ -95,24 +92,23 @@ else } @code { - private int _id = 0; - private string _level = "-"; - private string _function = "-"; - private string _rows = "10"; + private string _level = "-"; + private string _function = "-"; + private string _rows = "10"; private int _page = 1; - private List _logs; - private string _retention = ""; + private List _logs; + private string _retention = ""; - public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Host; + public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Host; - protected override async Task OnInitializedAsync() - { - try - { - if (PageState.QueryString.ContainsKey("id") && int.TryParse(PageState.QueryString["id"], out int id)) - { - _id = id; - } + protected override async Task OnInitializedAsync() + { + try + { + if (PageState.QueryString.ContainsKey("id") && int.TryParse(PageState.QueryString["id"], out int id)) + { + NavigationManager.NavigateTo(EditUrl(PageState.Page.Path, ModuleState.ModuleId, "Detail", $"id={id}")); + } if (PageState.QueryString.ContainsKey("level")) { _level = PageState.QueryString["level"]; diff --git a/Oqtane.Server/Infrastructure/LogManager.cs b/Oqtane.Server/Infrastructure/LogManager.cs index 589a25ef..900f5e91 100644 --- a/Oqtane.Server/Infrastructure/LogManager.cs +++ b/Oqtane.Server/Infrastructure/LogManager.cs @@ -203,12 +203,15 @@ namespace Oqtane.Infrastructure } if (Enum.Parse(log.Level) >= notifylevel) { + var alias = _tenantManager.GetAlias(); foreach (var userrole in _userRoles.GetUserRoles(log.SiteId.Value)) { if (userrole.Role.Name == RoleNames.Host) { - var url = $"{_accessor.HttpContext.Request.Scheme}://{_tenantManager.GetAlias().Name}/admin/log?id={log.LogId}"; - var notification = new Notification(log.SiteId.Value, userrole.User, "Site " + log.Level + " Notification", "Please visit " + url + " for more information"); + 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"; + var notification = new Notification(log.SiteId.Value, userrole.User, subject, body); _notifications.AddNotification(notification); } }