fix bug in lists

aircox_cms/sections.py

@@ -182,6 +182,7 @@ class BaseList(models.Model):
         none = 0x00
         subpages = 0x01
         siblings = 0x02
+        subpages_or_siblings = 0x03
 
     # rendering
     use_focus = models.BooleanField(
@@ -277,11 +278,14 @@ class BaseList(models.Model):
     def __get_related(self, qs):
         related = self.related and self.related.specific
 
-        if self.relation == self.RelationFilter.siblings:
+        filter = self.RelationFilter
+
+        if self.relation in (filter.subpages, filter.subpages_or_siblings):
+            qs =  qs.descendant_of(related)
+            if not qs.count() and self.relation == filter.subpages_or_siblings:
                 qs = qs.sibling_of(related)
         else:
-        # elif self.relation == RelatedFilter.subpages:
+            qs = qs.sibling_of(related)
-            qs = qs.descendant_of(related)
 
         date = related.date if hasattr(related, 'date') else \
                 related.first_published_at
@@ -398,7 +402,7 @@ class BaseList(models.Model):
         }
         params.update(kwargs)
 
-        if params.get('related'):
+        if self.related:
             params['related'] = True
 
         params = '&'.join([

aircox_cms/templates/aircox_cms/base_site.html

@@ -90,8 +90,10 @@
                 {% endif %}
                 {% endblock %}
 
+                {% if view != 'list' %}
                     {% block content_extras %}
                     {% endblock %}
+                {% endif %}
 
                 <div class="post_content">
                 {% render_sections position="post_content" %}