Merge pull request #3995 from fecgov/feature/3794-external-related-pa…

…ge-ResourcePage Add external page link to "Read next" sidebar on ResourcePage
fecgov · Aug 28, 2020 · 8823975 · 8823975
2 parents 915499f + 3ba51da
commit 8823975
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/fec/home/models.py b/fec/home/models.py
@@ -899,7 +899,8 @@ class ResourcePage(Page):
     ], null=True, blank=True)
     sidebar_title = models.CharField(max_length=255, null=True, blank=True)
     related_pages = StreamField([
-        ('related_pages', blocks.ListBlock(blocks.PageChooserBlock()))
+        ('related_pages', blocks.ListBlock(blocks.PageChooserBlock())),
+        ('external_page', blocks.RichTextBlock()),
     ], null=True, blank=True)
     sections = StreamField([
         ('sections', ResourceBlock())

diff --git a/fec/home/templates/home/resource_page.html b/fec/home/templates/home/resource_page.html
@@ -18,10 +18,14 @@
     <aside class="sidebar sidebar--secondary">
       <h4 class="sidebar__title">{{ self.sidebar_title }}</h4>
       <ul class="sidebar__content">
-        {% for related_pages in self.related_pages %}
-          {% for related_page in related_pages.value %}
-          <li class="u-padding--bottom"><a href="{{ related_page.url }}">{{ related_page.title }}</a></li>
-          {% endfor %}
+        {% for related_page in self.related_pages %}
+          {% if related_page.block_type == "related_pages" %}
+            {% for related in related_page.value %}
+             <li class="u-padding--bottom"><a href="{{ related.url }}">{{ related.title }}</a></li>
+            {% endfor %}
+          {% else %}
+            <li class="u-padding--bottom">{{ related_page.value}}</li>
+          {% endif %}
         {% endfor %}
       </ul>
       {% if self.show_search %}