Merge branch 'master' into remove-fb-from-footer

MozillaFoundation · Jul 19, 2018 · 254c67b · 254c67b
2 parents caca3d3 + e45a875
commit 254c67b
Show file tree

Hide file tree

Showing 8 changed files with 508 additions and 26 deletions.
diff --git a/network-api/networkapi/wagtailpages/customblocks.py b/network-api/networkapi/wagtailpages/customblocks.py
@@ -1,5 +1,3 @@
-import re
-
 from wagtail.core import blocks
 from wagtail.images.blocks import ImageChooserBlock
 
@@ -252,15 +250,6 @@ class Meta:
 
 
 class PulseProjectQueryValue(blocks.StructValue):
-    @property
-    def query(self):
-        # Replace any combination of spaces and commas with a single +
-        # because despite instructions to use spaces, someone, at some
-        # point, will accidentally use a comma, and that should be fine.
-        search_terms = self['search_terms'].strip()
-        query = re.sub(r'[\s,]+', '+', search_terms)
-        return query
-
     @property
     def size(self):
         max_number_of_results = self['max_number_of_results']

diff --git a/network-api/networkapi/wagtailpages/templates/wagtailpages/blocks/pulse_project_list.html b/network-api/networkapi/wagtailpages/templates/wagtailpages/blocks/pulse_project_list.html
@@ -4,5 +4,5 @@
   data-help="{{ value.help }}"
   data-issues="{{ value.issues }}"
   data-max="{{ value.size }}"
-  data-query="{{ value.query }}"
-  data-reversed="{{ value.newest_first }}" />
+  data-query="{{ value.search_terms }}"
+  data-reversed="{{ value.newest_first }}"></div>
diff --git a/...ork-api/networkapi/wagtailpages/templates/wagtailpages/tags/mini_site_horizontal_nav.html b/...ork-api/networkapi/wagtailpages/templates/wagtailpages/tags/mini_site_horizontal_nav.html
@@ -4,7 +4,7 @@
 <div class="mb-4 hidden-sm-down">
   <div class="pb-2 multipage-nav horizontal-nav" id="multipage-nav">
     {% for entry in menu_pages %}
-    <a class="pb-2 multipage-link horizontal-link mr-4 {% if current.title == entry.page.title %}multipage-link-active{% endif %}" href="{% pageurl entry.page %}">{% if entry.depth == 2 %}→ {% endif %}{{ entry.menu_title }}
+    <a class="pb-2 multipage-link horizontal-link mr-4 {% if current.title == entry.page.title %}multipage-link-active{% endif %} {% if entry.restriction != None %}multipage-{{entry.restriction}}-restricted{% endif %} {% if not entry.page.live %}multipage-draft{% endif %}" href="{% pageurl entry.page %}">{% if entry.depth == 2 %}→ {% endif %}{{ entry.menu_title }}
     </a>
     {% endfor %}
   </div>

diff --git a/network-api/networkapi/wagtailpages/templates/wagtailpages/tags/mini_site_sidebar.html b/network-api/networkapi/wagtailpages/templates/wagtailpages/tags/mini_site_sidebar.html
@@ -5,7 +5,7 @@
   <div class="multipage-nav side-nav" id="multipage-nav">
     {% for entry in menu_pages %}
     <div>
-      <a class="multipage-link {% if current.title == entry.page.title %}multipage-link-active{% endif %}" href="{% pageurl entry.page %}">{% if entry.depth == 2 %}→ {% endif %}{{ entry.menu_title }}
+      <a class="multipage-link {% if current.title == entry.page.title %}multipage-link-active{% endif %} {% if entry.restriction != None %}multipage-{{entry.restriction}}-restricted{% endif %} {% if not entry.page.live %}multipage-draft{% endif %}" href="{% pageurl entry.page %}">{% if entry.depth == 2 %}→ {% endif %}{{ entry.menu_title }}
       </a>
     </div>
     {% endfor %}

diff --git a/network-api/networkapi/wagtailpages/templates/wagtailpages/tags/primary_page_menu.html b/network-api/networkapi/wagtailpages/templates/wagtailpages/tags/primary_page_menu.html
@@ -7,7 +7,7 @@
       <div class="d-flex flex-row primary-menu" id="multipage-nav">
       	{% for entry in menu_pages %}
       	<div>
-      	  <a class="multipage-link {% if current.title == entry.page.title %}multipage-link-active{% endif %}" href="{% pageurl entry.page %}">{% if entry.depth == 2 %}→ {% endif %}{{ entry.menu_title }}
+      	  <a class="multipage-link {% if current.title == entry.page.title %}multipage-link-active{% endif %} {% if entry.restriction != None %}multipage-{{entry.restriction}}-restricted{% endif %} {% if not entry.page.live %}multipage-draft{% endif %}" href="{% pageurl entry.page %}">{% if entry.depth == 2 %}→ {% endif %}{{ entry.menu_title }}
       	  </a>
       	</div>
       	{% endfor %}

diff --git a/network-api/networkapi/wagtailpages/utils.py b/network-api/networkapi/wagtailpages/utils.py
@@ -36,18 +36,25 @@ def get_descendants(node, list, authenticated=False, depth=0, max_depth=2):
         if header:
             title = header
         menu_title = title if depth > 0 else 'Overview'
+        restriction = node.get_view_restrictions().first()
+        try:
+            restriction_type = restriction.restriction_type
+        except AttributeError:
+            restriction_type = None
+
         list.append({
             'page': node,
             'menu_title': menu_title,
             'depth': depth,
+            'restriction': restriction_type,
         })
 
         nextset = node.get_children().in_menu()
 
-        # Do not show draft pages to users who are
+        # Do not show draft/private pages to users who are
         # not logged into the CMS itself.
         if authenticated is False:
-            nextset = nextset.live()
+            nextset = nextset.live().public()
 
         for child in nextset:
             get_descendants(child, list, authenticated, depth + 1)