Skip to content

Regroup settings #5459

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

Merged
merged 3 commits into from
Mar 18, 2019
Merged

Regroup settings #5459

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8630cca
Regroup settings
stsewd Mar 14, 2019
b856e79
Reorder again
stsewd Mar 14, 2019
7af0ecd
Move python interpreter
stsewd Mar 18, 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
28 changes: 13 additions & 15 deletions readthedocs/projects/forms.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -208,24 +208,23 @@ class ProjectAdvancedForm(ProjectTriggerBuildMixin, ProjectForm):
class Meta:
model = Project
fields = (
# Standard build edits
'install_project',
'requirements_file',
'single_version',
'conf_py_file',
'default_branch',
# Global settings.
'default_version',
'default_branch',
'privacy_level',
'analytics_code',
Copy link
Contributor

Choose a reason for hiding this comment

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

This comment is outside the scope of this PR, but we could put this setting into the config file on a per-version basis. It might be nice to get that information versioned.

Copy link
Member

Choose a reason for hiding this comment

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

Any per-version config, is excellent for the YAML. I agree with David to implement this in another PR.

Copy link
Member Author

Choose a reason for hiding this comment

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

Don't people use just one analytics code per site? And also, isn't a way of identify each page from analytics?

Copy link
Member Author

Choose a reason for hiding this comment

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

I opened #5478

'show_version_warning',
'single_version',

# Options that can be set per-version using a config file.
'documentation_type',
'requirements_file',
'python_interpreter',
'install_project',
'use_system_packages',
'conf_py_file',
'enable_pdf_build',
'enable_epub_build',
# Privacy
'privacy_level',
# 'version_privacy_level',
# Python specific
'use_system_packages',
'python_interpreter',
# Fringe
'analytics_code',
)

def __init__(self, *args, **kwargs):
Expand Down Expand Up @@ -287,7 +286,6 @@ class Meta:
'repo_type',
# Extra
'description',
'documentation_type',
'language',
'programming_language',
'project_url',
Expand Down
1 change: 1 addition & 0 deletions readthedocs/rtd_tests/tests/test_project_symlinks.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1214,6 +1214,7 @@ def test_change_subproject_privacy(self):
# Required defaults
'python_interpreter': 'python',
'default_version': 'latest',
'documentation_type': 'sphinx',

'privacy_level': 'private',
},
Expand Down