Skip to content

Commit fba34a2

Browse files
committed
Render clean_url_without_trailing_slash_to_html properly
Required by readthedocs/readthedocs.org#12323
1 parent ccbc569 commit fba34a2

File tree

3 files changed

+23
-2
lines changed

3 files changed

+23
-2
lines changed

readthedocsext/theme/static/readthedocsext/theme/js/site.js

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

readthedocsext/theme/templates/projects/partials/edit/redirect_list.html

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,8 @@
9494
{% else %}
9595
{% if object.redirect_type == "clean_url_to_html" %}
9696
<span>/**/</span><span class="ui violet text">$1</span><span>/</span>
97+
{% elif object.redirect_type == "clean_url_without_trailing_slash_to_html" %}
98+
<span>/**/</span><span class="ui violet text">$1</span>
9799
{% elif object.redirect_type == "html_to_clean_url" %}
98100
<span>/**/</span><span class="ui violet text">$1</span><span>.html</span>
99101
{% endif %}
@@ -113,6 +115,8 @@
113115
{% else %}
114116
{% if object.redirect_type == "clean_url_to_html" %}
115117
<span>/**/</span><span class="ui violet text">$1</span><span>.html</span>
118+
{% elif object.redirect_type == "clean_url_without_trailing_slash_to_html" %}
119+
<span>/**/</span><span class="ui violet text">$1</span><span>.html</span>
116120
{% elif object.redirect_type == "html_to_clean_url" %}
117121
<span>/**/</span><span class="ui violet text">$1</span><span>/</span>
118122
{% endif %}

src/js/project/admin.js

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,10 @@ export class ProjectRedirectView {
5656
return "/$lang/$version/" + from_url.replace(/^\/+/, "");
5757
} else if (redirect_type === "exact") {
5858
return from_url;
59+
} else if (redirect_type === "clean_url_to_html") {
60+
return "/$lang/$version/$file/";
61+
} else if (redirect_type === "clean_url_without_trailing_slash_to_html") {
62+
return "/$lang/$version/$file";
5963
}
6064
return "";
6165
});
@@ -68,6 +72,10 @@ export class ProjectRedirectView {
6872
return "/$lang/$version/" + to_url.replace(/^\/+/, "");
6973
} else if (redirect_type === "exact") {
7074
return to_url;
75+
} else if (redirect_type === "clean_url_to_html") {
76+
return "/$lang/$version/$file.html";
77+
} else if (redirect_type === "clean_url_without_trailing_slash_to_html") {
78+
return "/$lang/$version/$file.html";
7179
}
7280
return "";
7381
});
@@ -83,6 +91,15 @@ export class ProjectRedirectView {
8391
}
8492
this.is_from_url_visible(true);
8593
this.is_to_url_visible(is_to_url_visible);
94+
} else if (
95+
[
96+
"clean_url_to_html",
97+
"clean_url_without_trailing_slash_to_html",
98+
].includes(redirect_type)
99+
) {
100+
this.is_example_disabled(false);
101+
this.is_from_url_visible(false);
102+
this.is_to_url_visible(false);
86103
} else {
87104
this.is_example_disabled(true);
88105
this.is_from_url_visible(false);

0 commit comments

Comments
 (0)