Diplomarbeit-Absolventenverein/oqtane.framework
10
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

Merge branch 'dev' into task/fix-issue-4358

Browse Source
This commit is contained in:
Shaun Walker
2024-07-06 08:32:10 -04:00
committed by GitHub
parent acbe000f97 a4eb3d7a0b
commit 34af53a15b
18 changed files with 249 additions and 410 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Oqtane.Shared/Shared/Constants.cs
View File

@ -82,6 +82,7 @@ namespace Oqtane.Shared
public const string SearchPageIdPropertyName = "PageId";
public const string SearchModuleIdPropertyName = "ModuleId";
public static readonly string[] InternalPagePaths = { "login", "register", "reset", "404" };
public const string DefaultTextEditorProvider = "Oqtane.Modules.Controls.QuillJSTextEditor, Oqtane.Client";
// Obsolete constants

11
Oqtane.Shared/Shared/Utilities.cs
View File

@ -560,7 +560,7 @@ namespace Oqtane.Shared
return (localDateTime?.Date, localTime);
}
public static bool IsPageModuleVisible(DateTime? effectiveDate, DateTime? expiryDate)
public static bool IsEffectiveOrExpired(DateTime? effectiveDate, DateTime? expiryDate)
{
DateTime currentUtcTime = DateTime.UtcNow;
@ -582,6 +582,7 @@ namespace Oqtane.Shared
return true;
}
}
public static bool ValidateEffectiveExpiryDates(DateTime? effectiveDate, DateTime? expiryDate)
{
// Treat DateTime.MinValue as null
@ -609,6 +610,7 @@ namespace Oqtane.Shared
return true;
}
}
[Obsolete("ContentUrl(Alias alias, int fileId) is deprecated. Use FileUrl(Alias alias, int fileId) instead.", false)]
public static string ContentUrl(Alias alias, int fileId)
{
@ -623,5 +625,12 @@ namespace Oqtane.Shared
return $"{alias?.BaseUrl}{aliasUrl}{Constants.ContentUrl}{fileId}{method}";
}
[Obsolete("IsPageModuleVisible(DateTime?, DateTime?) is deprecated. Use IsEffectiveOrExpired(DateTime?, DateTime?) instead.", false)]
public static bool IsPageModuleVisible(DateTime? effectiveDate, DateTime? expiryDate)
{
return IsEffectiveOrExpired(effectiveDate, expiryDate);
}
}
}