Merge branch 'master' into bg-slider-size

MozillaFoundation · Oct 23, 2018 · a9dea57 · a9dea57
2 parents 8616163 + c5f8099
commit a9dea57
Show file tree

Hide file tree

Showing 6 changed files with 49 additions and 4 deletions.
diff --git a/network-api/networkapi/buyersguide/factory.py b/network-api/networkapi/buyersguide/factory.py
@@ -63,6 +63,7 @@ def product_category(self, create, extracted, **kwargs):
     location_app = Faker('boolean')
     location_device = Faker('boolean')
     uses_encryption = Faker('boolean')
+    privacy_policy_reading_level_url = Faker('url')
     privacy_policy_reading_level = str(random.randint(7, 19))
     share_data = Faker('boolean')
     must_change_default_password = Faker('boolean')

diff --git a/network-api/networkapi/buyersguide/migrations/0011_auto_20181023_0005.py b/network-api/networkapi/buyersguide/migrations/0011_auto_20181023_0005.py
@@ -0,0 +1,25 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.16 on 2018-10-23 00:05
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('buyersguide', '0010_auto_20181018_2053'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='product',
+            name='privacy_policy_reading_level_url',
+            field=models.URLField(blank='True', help_text='Link to privacy policy reading level', max_length=2048),
+        ),
+        migrations.AlterField(
+            model_name='product',
+            name='privacy_policy_url',
+            field=models.URLField(blank='True', help_text='Link to privacy policy', max_length=2048),
+        ),
+    ]
diff --git a/network-api/networkapi/buyersguide/models.py b/network-api/networkapi/buyersguide/models.py
@@ -182,6 +182,8 @@ class Product(models.Model):
     )
 
     privacy_policy_url = models.URLField(
+        max_length=2048,
+        help_text='Link to privacy policy',
         blank="True"
     )
 
@@ -191,6 +193,12 @@ class Product(models.Model):
         max_length=2,
     )
 
+    privacy_policy_reading_level_url = models.URLField(
+        max_length=2048,
+        help_text='Link to privacy policy reading level',
+        blank="True"
+    )
+
     privacy_policy_helptext = models.TextField(
         max_length=5000,
         blank="True"

diff --git a/network-api/networkapi/buyersguide/templates/product_page.html b/network-api/networkapi/buyersguide/templates/product_page.html
@@ -66,12 +66,23 @@ <h3 class="h3-heading h3-heading-small">Can it spy on me?</h3>
       <h3 class="h3-heading h3-heading-small">What does it know about me?</h3>
 
       <div class="mb-5">
+        {# TODO: criterion tag and the following template code need to be cleaned up. See https://github.com/mozilla/foundation.mozilla.org/issues/2003  #}
         {% criterion "uses_encryption" "Product uses encryption" product.uses_encryption product.uses_encryption_helptext %}
+        {% with reading_level="Grade "|add:product.privacy_policy_reading_level %}
         {% if product.privacy_policy_url %}
-          {% criterion "privacy_policy_reading_level" "<a target=\\\"_blank\\\" href=\\\""|add:product.privacy_policy_url|add:"\\\">Privacy policy</a> reading level" product.privacy_policy_reading_level product.privacy_policy_helptext %}
+          {% if product.privacy_policy_reading_level_url %}
+            {% criterion "privacy_policy_reading_level" "<a target=\\\"_blank\\\" href=\\\""|add:product.privacy_policy_url|add:"\\\">Privacy policy</a> reading level" "<a target=\\\"_blank\\\" href=\\\""|add:product.privacy_policy_reading_level_url|add:"\\\">"|add:reading_level|add:"</a>" product.privacy_policy_helptext %}
+          {% else %}
+            {% criterion "privacy_policy_reading_level" "<a target=\\\"_blank\\\" href=\\\""|add:product.privacy_policy_url|add:"\\\">Privacy policy</a> reading level" reading_level product.privacy_policy_helptext %}
+          {% endif %}
         {% else %}
-          {% criterion "privacy_policy_reading_level" "Privacy policy reading level" product.privacy_policy_reading_level product.privacy_policy_helptext %}
+          {% if product.privacy_policy_reading_level_url %}
+            {% criterion "privacy_policy_reading_level" "Privacy policy reading level" "<a target=\\\"_blank\\\" href=\\\""|add:product.privacy_policy_reading_level_url|add:"\\\">"|add:reading_level|add:"</a>" product.privacy_policy_helptext %}
+          {% else %}
+            {% criterion "privacy_policy_reading_level" "Privacy policy reading level" reading_level product.privacy_policy_helptext %}
+          {% endif %}
         {% endif %}
+        {% endwith %}
         {% criterion "share_data" "Shares your information with third parties" product.share_data product.share_data_helptext %}
       </div>
 

diff --git a/network-api/networkapi/buyersguide/templatetags/criterion.py b/network-api/networkapi/buyersguide/templatetags/criterion.py
@@ -15,7 +15,7 @@ def criterion(id, question, answer, helptext=None, indeterminate_copy="Can't det
             formattedAnswer = indeterminate_copy
         else:
             cssClassSuffix = answer
-            formattedAnswer = ("Grade {answer}".format(answer=answer))
+            formattedAnswer = ("{answer}".format(answer=answer))
     else:
         cssClassSuffix = ("false", "true")[answer]
         formattedAnswer = ("No", "Yes")[answer]

diff --git a/source/js/buyers-guide/components/criterion/criterion.jsx b/source/js/buyers-guide/components/criterion/criterion.jsx
@@ -29,7 +29,7 @@ export default class Criterion extends React.Component {
               <button onClick={() => this.toggle()} className={this.state.helptextVisible ? `open` : `closed`}></button>
             }
           </p>
-          <p className="rating">{ meta.answer } <span className="emoji"></span></p>
+          <p className="rating"><span dangerouslySetInnerHTML={{__html: meta.answer}}></span> <span className="emoji"></span></p>
         </div>
         {this.state.helptextVisible &&
         <div className="helptext mt-3">