diff --git a/readthedocs/doc_builder/backends/sphinx.py b/readthedocs/doc_builder/backends/sphinx.py index 7e3d0914411..66154f68dea 100644 --- a/readthedocs/doc_builder/backends/sphinx.py +++ b/readthedocs/doc_builder/backends/sphinx.py @@ -214,10 +214,7 @@ class HtmlBuilder(BaseSphinx): def __init__(self, *args, **kwargs): super(HtmlBuilder, self).__init__(*args, **kwargs) - if self.project.allow_comments: - self.sphinx_builder = 'readthedocs-comments' - else: - self.sphinx_builder = 'readthedocs' + self.sphinx_builder = 'readthedocs' class HtmlDirBuilder(HtmlBuilder): @@ -225,10 +222,7 @@ class HtmlDirBuilder(HtmlBuilder): def __init__(self, *args, **kwargs): super(HtmlDirBuilder, self).__init__(*args, **kwargs) - if self.project.allow_comments: - self.sphinx_builder = 'readthedocsdirhtml-comments' - else: - self.sphinx_builder = 'readthedocsdirhtml' + self.sphinx_builder = 'readthedocsdirhtml' class SingleHtmlBuilder(HtmlBuilder): diff --git a/readthedocs/projects/admin.py b/readthedocs/projects/admin.py index fac08e3b087..7b6261af51a 100644 --- a/readthedocs/projects/admin.py +++ b/readthedocs/projects/admin.py @@ -102,8 +102,8 @@ class ProjectAdmin(GuardedModelAdmin): """Project model admin view.""" prepopulated_fields = {'slug': ('name',)} - list_display = ('name', 'slug', 'repo', 'repo_type', 'allow_comments', 'featured', 'theme') - list_filter = ('repo_type', 'allow_comments', 'featured', 'privacy_level', + list_display = ('name', 'slug', 'repo', 'repo_type', 'featured', 'theme') + list_filter = ('repo_type', 'featured', 'privacy_level', 'documentation_type', 'programming_language', ProjectOwnerBannedFilter) list_editable = ('featured',) diff --git a/readthedocs/rtd_tests/tests/test_builds.py b/readthedocs/rtd_tests/tests/test_builds.py index b53cd80b7ad..8f07156cfa3 100644 --- a/readthedocs/rtd_tests/tests/test_builds.py +++ b/readthedocs/rtd_tests/tests/test_builds.py @@ -129,32 +129,6 @@ def test_build_respects_yaml(self): # PDF however was disabled and therefore not built. self.assertFalse(self.mocks.pdf_build.called) - def test_builder_comments(self): - '''Normal build with comments''' - project = get(Project, - documentation_type='sphinx', - allow_comments=True, - versions=[fixture()]) - version = project.versions.all()[0] - build_env = LocalBuildEnvironment(version=version, project=project, build={}) - python_env = Virtualenv(version=version, build_env=build_env) - builder_class = get_builder_class(project.documentation_type) - builder = builder_class(build_env, python_env) - self.assertEqual(builder.sphinx_builder, 'readthedocs-comments') - - def test_builder_no_comments(self): - '''Test builder without comments''' - project = get(Project, - documentation_type='sphinx', - allow_comments=False, - versions=[fixture()]) - version = project.versions.all()[0] - build_env = LocalBuildEnvironment(version=version, project=project, build={}) - python_env = Virtualenv(version=version, build_env=build_env) - builder_class = get_builder_class(project.documentation_type) - builder = builder_class(build_env, python_env) - self.assertEqual(builder.sphinx_builder, 'readthedocs') - def test_build_pdf_latex_failures(self): '''Build failure if latex fails'''