Merge pull request #68235 from peterroth/fix-okd-version-switcher

aireilly · web-flow · commit 8be2fb792ba8 · 2023-11-30T13:43:50.000Z
[OKD] GH #68234 Fix OKD version switcher
diff --git a/_javascripts/page-loader.js b/_javascripts/page-loader.js
@@ -26,7 +26,7 @@ function versionSelector(list) {
     baseUrl = "https://docs.openshift.com/enterprise/";
   }
 
-  if (dk === "openshift-enterprise" && currentVersion.charAt(0) !== newVersion.charAt(0)){
+  if ((dk === "openshift-enterprise" || dk === "openshift-origin") && currentVersion.charAt(0) !== newVersion.charAt(0)){
     fileRequested = "/welcome/index.html";
   } else {
     const versionIndex = window.location.pathname.lastIndexOf(currentVersion) + currentVersion.length;

Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ function versionSelector(list) {`
`26`	`26`	`baseUrl = "https://docs.openshift.com/enterprise/";`
`27`	`27`	`}`
`28`	`28`
`29`		`- if (dk === "openshift-enterprise" && currentVersion.charAt(0) !== newVersion.charAt(0)){`
	`29`	`+ if ((dk === "openshift-enterprise" \|\| dk === "openshift-origin") && currentVersion.charAt(0) !== newVersion.charAt(0)){`
`30`	`30`	`fileRequested = "/welcome/index.html";`
`31`	`31`	`} else {`
`32`	`32`	`const versionIndex = window.location.pathname.lastIndexOf(currentVersion) + currentVersion.length;`