From a2f8fe3694595365f96c672b4d58f398a2e3f220 Mon Sep 17 00:00:00 2001 From: Shaun Walker Date: Thu, 6 Jan 2022 17:24:18 -0500 Subject: [PATCH] convention shortcut to suppress title in container --- .../BlazorTheme/Containers/Container.razor | 21 ++++++++++++------- .../OqtaneTheme/Containers/Container.razor | 2 +- Oqtane.Server/Controllers/JobController.cs | 4 ++-- 3 files changed, 17 insertions(+), 10 deletions(-) diff --git a/Oqtane.Client/Themes/BlazorTheme/Containers/Container.razor b/Oqtane.Client/Themes/BlazorTheme/Containers/Container.razor index 9ca3599e..15a6f398 100644 --- a/Oqtane.Client/Themes/BlazorTheme/Containers/Container.razor +++ b/Oqtane.Client/Themes/BlazorTheme/Containers/Container.razor @@ -1,13 +1,20 @@ @namespace Oqtane.Themes.BlazorTheme @inherits ContainerBase
-
-
-

-
-
-
-
+ @if (ModuleState.Title != "-") + { +
+
+

+
+
+
+ } + else + { + + } +
diff --git a/Oqtane.Client/Themes/OqtaneTheme/Containers/Container.razor b/Oqtane.Client/Themes/OqtaneTheme/Containers/Container.razor index b90d8c32..cc3647f8 100644 --- a/Oqtane.Client/Themes/OqtaneTheme/Containers/Container.razor +++ b/Oqtane.Client/Themes/OqtaneTheme/Containers/Container.razor @@ -3,7 +3,7 @@ @inject ISettingService SettingService
- @if (_title) + @if (_title && ModuleState.Title != "-") {
diff --git a/Oqtane.Server/Controllers/JobController.cs b/Oqtane.Server/Controllers/JobController.cs index 356fd75f..fb3bd99a 100644 --- a/Oqtane.Server/Controllers/JobController.cs +++ b/Oqtane.Server/Controllers/JobController.cs @@ -55,7 +55,7 @@ namespace Oqtane.Controllers } else { - _logger.Log(LogLevel.Error, this, LogFunction.Security, "Unauthorized Job Post Attempt {Alias}", job); + _logger.Log(LogLevel.Error, this, LogFunction.Security, "Unauthorized Job Post Attempt {Job}", job); HttpContext.Response.StatusCode = (int)HttpStatusCode.Forbidden; job = null; } @@ -74,7 +74,7 @@ namespace Oqtane.Controllers } else { - _logger.Log(LogLevel.Error, this, LogFunction.Security, "Unauthorized Job Put Attempt {Alias}", job); + _logger.Log(LogLevel.Error, this, LogFunction.Security, "Unauthorized Job Put Attempt {Job}", job); HttpContext.Response.StatusCode = (int)HttpStatusCode.Forbidden; job = null; }