Merge branch 'master' into gsoc-19-pr-builder

Author: saadmk11

readthedocs/builds/admin.py

@@ -1,11 +1,17 @@
 """Django admin interface for `~builds.models.Build` and related models."""
 
+import json
 from django.contrib import admin, messages
+from django.utils.safestring import mark_safe
 from polymorphic.admin import (
     PolymorphicChildModelAdmin,
     PolymorphicParentModelAdmin,
 )
 
+from pygments import highlight
+from pygments.lexers import JsonLexer
+from pygments.formatters import HtmlFormatter
+
 from readthedocs.builds.models import (
     Build,
     BuildCommandResult,
@@ -19,6 +25,29 @@
 from readthedocs.search.utils import _indexing_helper
 
 
+def _pretty_config(instance):
+    """
+    Function to display pretty version of our data.
+
+    Thanks to PyDanny: https://www.pydanny.com/pretty-formatting-json-django-admin.html
+    """
+
+    # Convert the data to sorted, indented JSON
+    response = json.dumps(instance.config, sort_keys=True, indent=2)
+
+    # Get the Pygments formatter
+    formatter = HtmlFormatter()
+
+    # Highlight the data
+    response = highlight(response, JsonLexer(), formatter)
+
+    # Get the stylesheet
+    style = "<style>" + formatter.get_style_defs() + "</style><br>"
+
+    # Safe the output
+    return mark_safe(style + response)
+
+
 class BuildCommandResultInline(admin.TabularInline):
     model = BuildCommandResult
     fields = ('command', 'exit_code', 'output')
@@ -34,6 +63,10 @@ class BuildAdmin(admin.ModelAdmin):
         'success',
         'length',
         'cold_storage',
+        'pretty_config',
+    )
+    readonly_fields = (
+        'pretty_config',  # required to be read-only becuase it's a @property
     )
     list_display = (
         'id',
@@ -54,6 +87,11 @@ class BuildAdmin(admin.ModelAdmin):
     def version_name(self, obj):
         return obj.version.verbose_name
 
+    def pretty_config(self, instance):
+        return _pretty_config(instance)
+
+    pretty_config.short_description = 'Config File'
+
 
 class VersionAdmin(admin.ModelAdmin):
 
@@ -65,6 +103,9 @@ class VersionAdmin(admin.ModelAdmin):
         'active',
         'built',
     )
+    readonly_fields = (
+        'pretty_config',  # required to be read-only becuase it's a @property
+    )
     list_filter = ('type', 'privacy_level', 'active', 'built')
     search_fields = ('slug', 'project__slug')
     raw_id_fields = ('project',)
@@ -83,6 +124,10 @@ def wipe_selected_versions(self, request, queryset):
                 level=messages.SUCCESS
             )
 
+    def pretty_config(self, instance):
+        return _pretty_config(instance)
+
+    pretty_config.short_description = 'Config File'
     wipe_selected_versions.short_description = 'Wipe selected versions'
 
     def build_version(self, request, queryset):

readthedocs/projects/models.py

@@ -767,10 +767,6 @@ def conf_dir(self, version=LATEST):
         if conf_file:
             return os.path.dirname(conf_file)
 
-    @property
-    def is_imported(self):
-        return bool(self.repo)
-
     @property
     def has_good_build(self):
         # Check if there is `_good_build` annotation in the Queryset.
@@ -779,14 +775,6 @@ def has_good_build(self):
             return self._good_build
         return self.builds(manager=INTERNAL).filter(success=True).exists()
 
-    @property
-    def has_versions(self):
-        return self.versions.exists()
-
-    @property
-    def has_aliases(self):
-        return self.aliases.exists()
-
     def has_media(self, type_, version_slug=LATEST, version_type=None):
         path = self.get_production_media_path(
             type_=type_, version_slug=version_slug
@@ -825,10 +813,6 @@ def has_htmlzip(self, version_slug=LATEST, version_type=None):
             version_type=version_type
         )
 
-    @property
-    def sponsored(self):
-        return False
-
     def vcs_repo(
             self, version=LATEST, environment=None,
             verbose_name=None, version_type=None