diff options
author | 2019-04-15 15:00:11 +0100 | |
---|---|---|
committer | 2019-04-15 15:00:11 +0100 | |
commit | db00d8720dce82d7caedfe4c37797e6e91e75612 (patch) | |
tree | 6fe7bb9f54f16bb3286d2e128e5e1473929e0693 | |
parent | Images sidebar work, and allow fields to be rendered without labels (diff) |
Better method for default label rendering
-rw-r--r-- | pydis_site/apps/home/templatetags/wiki_extra.py | 3 | ||||
-rw-r--r-- | pydis_site/settings.py | 7 |
2 files changed, 6 insertions, 4 deletions
diff --git a/pydis_site/apps/home/templatetags/wiki_extra.py b/pydis_site/apps/home/templatetags/wiki_extra.py index d4e9b266..ca368e2c 100644 --- a/pydis_site/apps/home/templatetags/wiki_extra.py +++ b/pydis_site/apps/home/templatetags/wiki_extra.py @@ -68,6 +68,9 @@ def render_field(field: Field, render_labels: bool = True): else: unbound_field = field + if not isinstance(render_labels, bool): + render_labels = True + template_path = TEMPLATES.get(unbound_field.__class__) is_markitup = isinstance(unbound_field.widget, MarkItUpWidget) diff --git a/pydis_site/settings.py b/pydis_site/settings.py index c4a1bf7e..58bf5abe 100644 --- a/pydis_site/settings.py +++ b/pydis_site/settings.py @@ -39,7 +39,8 @@ if DEBUG: 'admin.pythondiscord.local', 'api.pythondiscord.local', 'staff.pythondiscord.local', - 'wiki.pythondiscord.local' + 'wiki.pythondiscord.local', + '*', # PLEASE yell at me if I commit this ] SECRET_KEY = "+_x00w3e94##2-qm-v(5&-x_@*l3t9zlir1etu+7$@4%!it2##" @@ -93,7 +94,6 @@ INSTALLED_APPS = [ 'wiki.plugins.images.apps.ImagesConfig', 'wiki.plugins.links.apps.LinksConfig', 'wiki.plugins.redlinks.apps.RedlinksConfig', - 'wiki.plugins.macros.apps.MacrosConfig', ] MIDDLEWARE = [ @@ -202,7 +202,7 @@ ROOT_HOSTCONF = 'pydis_site.hosts' DEFAULT_HOST = 'home' if DEBUG: - PARENT_HOST = 'pythondiscord.local:8000' + PARENT_HOST = 'trixie.gserv.me:8000' else: PARENT_HOST = env('PARENT_HOST', default='pythondiscord.com') @@ -307,7 +307,6 @@ WIKI_MARKDOWN_KWARGS = { "wiki.core.markdown.mdx.codehilite", "wiki.core.markdown.mdx.previewlinks", "wiki.core.markdown.mdx.responsivetable", - "wiki.plugins.macros.mdx.macro", "wiki.plugins.macros.mdx.toc", "wiki.plugins.macros.mdx.wikilinks", ] |