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

fix #2366 - populate new UrlParameters property

Browse Source
This commit is contained in:
Shaun Walker 2022-09-04 09:35:18 -04:00
parent 282a0b0c44
commit 51e2e2966f
3 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Oqtane.Client/Modules/Admin/Logs/Detail.razor
View File

@ -130,7 +130,7 @@
private string _properties = string.Empty;
private string _server = string.Empty;
public override string RouteTemplate => "/{id}";
public override string UrlParameterTemplate => "/{id}";
public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Host;
protected override async Task OnInitializedAsync()

4
Oqtane.Client/Modules/Admin/Logs/Index.razor
View File

@ -99,10 +99,10 @@ else
private List<Log> _logs;
private string _retention = "";
public override string RouteTemplate => "/{level}/{function}/{rows}/{page}";
public override string UrlParameterTemplate => "/{level}/{function}/{rows}/{page}";
public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Host;
protected override async Task OnInitializedAsync()
protected override async Task OnParametersSetAsync()
{
try
{

10
Oqtane.Client/Modules/ModuleBase.cs
View File

@ -15,6 +15,7 @@ namespace Oqtane.Modules
public abstract class ModuleBase : ComponentBase, IModuleControl
{
private Logger _logger;
private string _urlparametersstate;
private Dictionary<string, string> _urlparameters;
protected Logger logger => _logger ?? (_logger = new Logger(this));
@ -49,14 +50,15 @@ namespace Oqtane.Modules
public virtual List<Resource> Resources { get; set; }
// url parameters
public virtual string RouteTemplate { get; set; }
public virtual string UrlParameterTemplate { get; set; }
public Dictionary<string, string> UrlParameters {
get
{
if (_urlparameters == null)
if (_urlparametersstate == null || _urlparametersstate != PageState.UrlParameters)
{
_urlparameters = GetUrlParameters(RouteTemplate);
_urlparametersstate = PageState.UrlParameters;
_urlparameters = GetUrlParameters(UrlParameterTemplate);
}
return _urlparameters;
}
@ -183,7 +185,7 @@ namespace Oqtane.Modules
public virtual Dictionary<string, string> GetUrlParameters(string template = "")
{
var urlParameters = new Dictionary<string, string>();
var parameters = PageState.UrlParameters.Split('/', StringSplitOptions.RemoveEmptyEntries);
var parameters = _urlparametersstate.Split('/', StringSplitOptions.RemoveEmptyEntries);
if (string.IsNullOrEmpty(template))
{