Pass user into flat page lookup, fix issues

Author: destos

toolhub/templates/flatpages/default.jinja

@@ -1,9 +1,30 @@
+{% from "macros/links.jinja" import object_link -%}
 {% extends "layouts/sub_header_base.jinja" %}
 
 {% block head_title %}{{ flatpage.title }}{% endblock %}
 
 {% block sub_header %}{{ flatpage.title }}{% endblock %}
 
+{% block sub_actions %}
+    {%- set pages = get_flatpages(starts_with=flatpage.url, user=user) %}
+    {% if pages.count() > 0 %}
+        <div class="navbar-text text-muted">
+            {{ _("Sub Pages:") }}&nbsp;
+        </div>
+    {% endif %}
+    <ul class="navbar-nav">
+    {%- for page in pages %}
+        <li class="nav-item">
+        {%- call object_link(page, "page-link", ["nav-link"]) -%}
+            {{ page.title }}
+        {%- endcall -%}
+        </li>
+    {% endfor -%}
+    </ul>
+{% endblock %}
+
 {% block content %}
+<div class="content">
 {{ markdown(flatpage.content) }}
+</div>
 {% endblock %}

toolhub/templates/partials/footer.jinja

@@ -11,12 +11,12 @@
                 </div>
                 <div>
                     {% block footer_container %}
-                        {%- set pages = get_flatpages() %}
+                        {%- set pages = get_flatpages(user=user) %}
                         {%- for page in pages %}
                             {%- call object_link(page, "page-link", ["text-white"]) -%}
                                 {{ page.title }}
-                                <br>
                             {%- endcall -%}
+                            <br>
                         {% endfor -%}
                     {% endblock %}
                 </div>

utils/templatetags/flatpages.py

@@ -15,7 +15,7 @@ def get_flatpages(context, starts_with=None, user=None):
     flatpages = FlatPage.objects.filter(sites__id=site_pk)
     # If a prefix was specified, add a filter
     if starts_with:
-        flatpages = flatpages.filter(url__startswith=starts_with)
+        flatpages = flatpages.filter(url__startswith=starts_with).exclude(url=starts_with)
 
     # If the provided user is not authenticated, or no user
     # was provided, filter the list to only public flatpages.