Skip to content

Version page should show build status + not being able to pick a non-built doc #5169

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 13 commits into from
Closed

Version page should show build status + not being able to pick a non-built doc #5169

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
968c288
add some small features
dojutsu-user Jan 24, 2019
5d60dce
Merge branch 'master' into HEAD
dojutsu-user Jan 31, 2019
9da72f5
Merge branch 'master' into some-extra-features
dojutsu-user Mar 1, 2019
c20509e
use template tags
dojutsu-user Mar 1, 2019
ca1ff6e
add if
dojutsu-user Mar 1, 2019
ff82284
edit func doc
dojutsu-user Mar 1, 2019
1ea7411
Merge branch 'master' into some-extra-features
dojutsu-user Mar 29, 2019
8374601
Add improvements
dojutsu-user Mar 29, 2019
41eda6e
remove inline css
dojutsu-user Mar 29, 2019
dbc9bbe
Merge branch 'master' into some-extra-features
ericholscher Jun 6, 2019
b932506
Merge branch 'master' into some-extra-features
dojutsu-user Aug 4, 2019
d975428
Merge branch 'some-extra-features' of https://github.com/dojutsu-user…
dojutsu-user Aug 4, 2019
d9651ad
improvements
dojutsu-user Aug 4, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion readthedocs/projects/forms.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -444,7 +444,7 @@ def build_versions_form(project):
active = versions_qs.filter(active=True)
if active.exists():
active = sort_version_aware(active)
choices = [(version.slug, version.verbose_name) for version in active]
choices = [(version.slug, version.verbose_name) for version in active if version.built]
attrs['default-version'] = forms.ChoiceField(
label=_('Default Version'),
choices=choices,
Expand Down
9 changes: 9 additions & 0 deletions readthedocs/templates/core/project_details.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,15 @@ <h3>{% trans "Versions" %}</h3>
{% if request.user|is_admin:project %}
<ul class="module-item-menu">
<li><a href="{% url "project_version_detail" project.slug version.slug %}">{% trans "Edit" %}</a></li>
<li>
<span class="right quiet" style="margin:10px 5px 0px 0px;">
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We shouldn't have inline styles

{% if version.built %}
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This isn't checking if the build is passing, but only that it has ever passed. We should properly check the last build for this version to get this data.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@ericholscher
I have implemented a custom template tag for this purpose.

<span class="build-state build-state-passing">{% trans "passing" %}</span>
{% else %}
<span class="build-state build-state-failing" style="margin-left:14px">{% trans "failing" %}</span>
{% endif %}
</span>
<li>
</ul>
{% endif %}
</li>
Expand Down