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

fix #1647 - module reordering on page issue

Browse Source
This commit is contained in:
Shaun Walker
2021-09-10 13:12:00 -04:00
parent 53e5728ad2
commit 14fbc3a5b4
3 changed files with 23 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,6 +1,7 @@
using Oqtane.Models;
using System;
using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
using System.Globalization;
using System.IO;
using System.Linq;
@ -60,13 +61,16 @@ namespace Oqtane.Shared
string urlparameters;
string querystring;
string anchor;
(urlparameters, querystring, anchor) = ParseParameters(parameters);
// parse parameters
(urlparameters, querystring, anchor) = ParseParameters(parameters);
if (!string.IsNullOrEmpty(urlparameters))
{
if (urlparameters.StartsWith("/")) urlparameters = urlparameters.Remove(0, 1);
path += $"/{Constants.UrlParametersDelimiter}/{urlparameters}";
}
// build url
var uriBuilder = new UriBuilder
{
Path = !string.IsNullOrEmpty(alias)
@ -76,9 +80,9 @@ namespace Oqtane.Shared
: $"{path}",
Query = querystring,
};
anchor = string.IsNullOrEmpty(anchor) ? "" : "#" + anchor;
var navigateUrl = uriBuilder.Uri.PathAndQuery + anchor;
return navigateUrl;
return uriBuilder.Uri.PathAndQuery + anchor;
}
public static string EditUrl(string alias, string path, int moduleid, string action, string parameters)