Skip to content

Commit

Permalink
support section variable in manual url (#8494)
Browse files Browse the repository at this point in the history
* support section variable in manual url

* isoLang variable, help wording

* Revert "isoLang variable, help wording"

This reverts commit 0b000ce

* ignore path "/" for default language replacement

* Update web-ui/src/main/resources/catalog/locales/en-admin.json

Co-authored-by: Jose García <[email protected]>

* remove double slash

* remove double slash in error handler

---------

Co-authored-by: Jose García <[email protected]>
  • Loading branch information
wangf1122 and josegar74 committed Dec 16, 2024
1 parent 04eed35 commit 4a07319
Showing 1 changed file with 22 additions and 3 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -140,6 +140,18 @@
return defer.promise;
};

/**
* Processes an URL removing // characters in the URL path.
*
* @param url
* @returns {string}
*/
var processUrl = function(url) {
var urlToProcess = new URL(url);
urlToProcess.pathname = urlToProcess.pathname.replace(/\/\//g, "/");
return urlToProcess.toString();
}

/**
* Get the URL of the corresponding help page and open it in a new tab
* @returns {boolean}
Expand All @@ -152,18 +164,25 @@
if (gnGlobalSettings.lang !== "en") {
baseUrl = scope.helpBaseUrl.replace("{{lang}}", gnGlobalSettings.lang);
} else {
baseUrl = scope.helpBaseUrl.replace("/{{lang}}", "");
baseUrl = scope.helpBaseUrl.replace("{{lang}}", "");
}

baseUrl = baseUrl.replace("{{version}}", scope.applicationVersion);

var helpPageUrl = baseUrl + "/" + page;
var helpPageUrl;
if (baseUrl.includes("{{section}}")) {
helpPageUrl = baseUrl.replace("{{section}}", page);
} else {
helpPageUrl = baseUrl + "/" + page;
}

helpPageUrl = processUrl(helpPageUrl);

testAndOpen(helpPageUrl).then(
function () {},
function () {
var baseUrl = scope.helpBaseUrl
.replace("/{{lang}}", "")
.replace("{{lang}}", "")
.replace("{{version}}", scope.applicationVersion);
var helpPageUrl = baseUrl + "/" + page;

Expand Down

0 comments on commit 4a07319

Please sign in to comment.