Merge pull request #640 from PoisnFang/routing

Url parameter helper enhancements
This commit is contained in:
Shaun Walker
2020-07-02 08:11:14 -04:00
committed by GitHub

View File

@ -116,35 +116,51 @@ namespace Oqtane.Modules
return Utilities.ContentUrl(PageState.Alias, fileid); return Utilities.ContentUrl(PageState.Alias, fileid);
} }
public Dictionary<string, string> GetUrlParameters(string parameterTemplate) public virtual Dictionary<string, string> GetUrlParameters(string parametersTemplate = "")
{ {
var urlParameters = new Dictionary<string, string>(); var urlParameters = new Dictionary<string, string>();
string[] templateSegments;
var templateSegments = parameterTemplate.Split('/', StringSplitOptions.RemoveEmptyEntries);
var parameters = PageState.UrlParameters.Split('/', StringSplitOptions.RemoveEmptyEntries); var parameters = PageState.UrlParameters.Split('/', StringSplitOptions.RemoveEmptyEntries);
var parameterId = 0;
if (parameters.Length == templateSegments.Length) if (string.IsNullOrEmpty(parametersTemplate))
{ {
for (int i = 0; i < parameters.Length; i++) for (int i = 0; i < parameters.Length; i++)
{ {
if (parameters.Length > i) urlParameters.TryAdd("parameter" + i, parameters[i]);
}
}
else
{
templateSegments = parametersTemplate.Split('/', StringSplitOptions.RemoveEmptyEntries);
if (parameters.Length == templateSegments.Length)
{
for (int i = 0; i < parameters.Length; i++)
{ {
if (templateSegments[i] == parameters[i]) if (parameters.Length > i)
{ {
} if (templateSegments[i] == parameters[i])
else if (templateSegments[i].StartsWith("{") && templateSegments[i].EndsWith("}")) {
{ urlParameters.TryAdd("parameter" + parameterId, parameters[i]);
var key = templateSegments[i].Replace("{", ""); parameterId++;
key = key.Replace("}", ""); }
urlParameters.TryAdd(key, parameters[i]); else if (templateSegments[i].StartsWith("{") && templateSegments[i].EndsWith("}"))
} {
else var key = templateSegments[i].Replace("{", "");
{ key = key.Replace("}", "");
i = parameters.Length; urlParameters.TryAdd(key, parameters[i]);
}
else
{
i = parameters.Length;
urlParameters.Clear();
}
} }
} }
} }
} }
return urlParameters; return urlParameters;
} }