Skip to content

Commit

Permalink
fix: correct linking when setting defaultVersionShown to non-latest v…
Browse files Browse the repository at this point in the history
…ersion
  • Loading branch information
endiliey committed Aug 9, 2018
1 parent e27e18b commit 509646d
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 2 deletions.
1 change: 1 addition & 0 deletions lib/server/__tests__/docs.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ jest.mock('../env', () => ({
versioning: {
enabled: true,
defaultVersion: '1.0.0',
latestVersion: '1.0.0',
},
}));

Expand Down
2 changes: 1 addition & 1 deletion lib/server/docs.js
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ function mdToHtmlify(oldContent, mdToHtml, metadata) {
htmlLink = htmlLink.replace('/en/', `/${metadata.language}/`);
htmlLink = htmlLink.replace(
'/VERSION/',
metadata.version && metadata.version !== env.versioning.defaultVersion
metadata.version && metadata.version !== env.versioning.latestVersion
? `/${metadata.version}/`
: '/'
);
Expand Down
4 changes: 3 additions & 1 deletion lib/server/env.js
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ class Translation {
class Versioning {
constructor() {
this.enabled = false;
this.latestVersion = null;
this.defaultVersion = null;
this.versions = [];
this.missingVersionsPage = false;
Expand All @@ -64,9 +65,10 @@ class Versioning {
if (fs.existsSync(versionsJSONFile)) {
this.enabled = true;
this.versions = JSON.parse(fs.readFileSync(versionsJSONFile, 'utf8'));
this.latestVersion = this.versions[0];
this.defaultVersion = siteConfig.defaultVersionShown
? siteConfig.defaultVersionShown
: this.versions[0]; // otherwise show the latest version (other than next/master)
: this.latestVersion; // otherwise show the latest version (other than next/master)
}

if (!fs.existsSync(versionsFile)) {
Expand Down

0 comments on commit 509646d

Please sign in to comment.