Merge 64f93ae into 0599f2f

network-api/networkapi/buyersguide/factory.py

@@ -29,21 +29,21 @@ class Meta:
     url = Faker('url')
     price = random.randint(49, 1500)
     camera_app = Faker('boolean')
+    meets_minimum_security_standards = Faker('boolean')
     camera_device = Faker('boolean')
     microphone_app = Faker('boolean')
     microphone_device = Faker('boolean')
     location_app = Faker('boolean')
     location_device = Faker('boolean')
     uses_encryption = Faker('boolean')
-    privacy_policy = str(random.randint(0, 1))
+    privacy_policy_reading_level = str(random.randint(7, 19))
     share_data = Faker('boolean')
     must_change_default_password = Faker('boolean')
     security_updates = Faker('boolean')
     need_account = Faker('boolean')
     delete_data = Faker('boolean')
     child_rules = Faker('boolean')
     manage_security = Faker('boolean')
-    customer_support_easy = Faker('boolean')
     phone_number = Faker('phone_number')
     live_chat = Faker('url')
     email = Faker('email')

network-api/networkapi/buyersguide/migrations/0004_product_related_products.py

@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.14 on 2018-09-27 22:02
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('buyersguide', '0003_auto_20180927_2052'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='product',
+            name='related_products',
+            field=models.ManyToManyField(null=True, related_name='rps', to='buyersguide.Update'),
+        ),
+    ]

network-api/networkapi/buyersguide/migrations/0005_auto_20180927_2203.py

@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.14 on 2018-09-27 22:03
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('buyersguide', '0004_product_related_products'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='product',
+            name='related_products',
+            field=models.ManyToManyField(null=True, related_name='rps', to='buyersguide.Product'),
+        ),
+    ]

network-api/networkapi/buyersguide/migrations/0006_auto_20180927_2205.py

@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.14 on 2018-09-27 22:05
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('buyersguide', '0005_auto_20180927_2203'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='product',
+            name='related_products',
+            field=models.ManyToManyField(null=True, related_name='_product_related_products_+', to='buyersguide.Product'),
+        ),
+    ]

network-api/networkapi/buyersguide/migrations/0007_auto_20180928_1834.py

@@ -0,0 +1,25 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.14 on 2018-09-28 18:34
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('buyersguide', '0006_auto_20180927_2205'),
+    ]
+
+    operations = [
+        migrations.RenameField(
+            model_name='product',
+            old_name='privacy_policy',
+            new_name='privacy_policy_reading_level',
+        ),
+        migrations.AddField(
+            model_name='product',
+            name='privacy_policy_url',
+            field=models.URLField(blank='True'),
+        ),
+    ]

network-api/networkapi/buyersguide/migrations/0008_auto_20180928_1856.py

@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.14 on 2018-09-28 18:56
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('buyersguide', '0007_auto_20180928_1834'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='product',
+            name='privacy_policy_reading_level',
+            field=models.CharField(choices=[(None, "Can't Determine"), ('0', 'Grade 8-12'), ('1', 'Grade 13+')], default=0, max_length=1),
+        ),
+    ]

network-api/networkapi/buyersguide/migrations/0009_auto_20180928_1857.py

@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.14 on 2018-09-28 18:57
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('buyersguide', '0008_auto_20180928_1856'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='product',
+            name='privacy_policy_reading_level',
+            field=models.CharField(blank='True', choices=[(None, "Can't Determine"), ('0', 'Grade 8-12'), ('1', 'Grade 13+')], default=None, max_length=1),
+        ),
+    ]

network-api/networkapi/buyersguide/migrations/0010_auto_20180928_1907.py

@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.14 on 2018-09-28 19:07
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('buyersguide', '0009_auto_20180928_1857'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='product',
+            name='privacy_policy_reading_level',
+            field=models.CharField(choices=[('0', "Can't Determine"), ('7', 'Grade 7'), ('8', 'Grade 8'), ('9', 'Grade 9'), ('10', 'Grade 10'), ('11', 'Grade 11'), ('12', 'Grade 12'), ('13', 'Grade 13'), ('14', 'Grade 14'), ('15', 'Grade 15'), ('16', 'Grade 16'), ('17', 'Grade 17'), ('18', 'Grade 18'), ('19', 'Grade 19')], default='0', max_length=2),
+        ),
+    ]

network-api/networkapi/buyersguide/migrations/0011_auto_20180928_2049.py

@@ -0,0 +1,24 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.14 on 2018-09-28 20:49
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('buyersguide', '0010_auto_20180928_1907'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='product',
+            name='customer_support_easy',
+        ),
+        migrations.AddField(
+            model_name='product',
+            name='twitter',
+            field=models.CharField(blank='True', help_text='Twitter username', max_length=100),
+        ),
+    ]

network-api/networkapi/buyersguide/migrations/0012_auto_20180928_2139.py

@@ -0,0 +1,25 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.14 on 2018-09-28 21:39
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('buyersguide', '0011_auto_20180928_2049'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='product',
+            name='related_products',
+            field=models.ManyToManyField(blank=True, null=True, related_name='_product_related_products_+', to='buyersguide.Product'),
+        ),
+        migrations.AlterField(
+            model_name='product',
+            name='updates',
+            field=models.ManyToManyField(blank=True, null=True, related_name='products', to='buyersguide.Update'),
+        ),
+    ]

network-api/networkapi/buyersguide/migrations/0013_auto_20180928_2247.py

@@ -0,0 +1,24 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.14 on 2018-09-28 22:47
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('buyersguide', '0012_auto_20180928_2139'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='product',
+            name='customer_support_easy_helptext',
+        ),
+        migrations.AlterField(
+            model_name='product',
+            name='privacy_policy_reading_level',
+            field=models.CharField(blank='True', choices=[('0', "Can't Determine"), ('7', 'Grade 7'), ('8', 'Grade 8'), ('9', 'Grade 9'), ('10', 'Grade 10'), ('11', 'Grade 11'), ('12', 'Grade 12'), ('13', 'Grade 13'), ('14', 'Grade 14'), ('15', 'Grade 15'), ('16', 'Grade 16'), ('17', 'Grade 17'), ('18', 'Grade 18'), ('19', 'Grade 19')], default='0', max_length=2),
+        ),
+    ]

network-api/networkapi/buyersguide/migrations/0014_auto_20180928_2250.py

@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.14 on 2018-09-28 22:50
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('buyersguide', '0013_auto_20180928_2247'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='product',
+            name='privacy_policy_reading_level',
+            field=models.CharField(choices=[('0', "Can't Determine"), ('7', 'Grade 7'), ('8', 'Grade 8'), ('9', 'Grade 9'), ('10', 'Grade 10'), ('11', 'Grade 11'), ('12', 'Grade 12'), ('13', 'Grade 13'), ('14', 'Grade 14'), ('15', 'Grade 15'), ('16', 'Grade 16'), ('17', 'Grade 17'), ('18', 'Grade 18'), ('19', 'Grade 19')], default='0', max_length=2),
+        ),
+    ]

network-api/networkapi/buyersguide/migrations/0015_product_has_moz_approval.py

@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.14 on 2018-10-01 17:30
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('buyersguide', '0014_auto_20180928_2250'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='product',
+            name='has_moz_approval',
+            field=models.NullBooleanField(help_text='Does this product bear the Mozilla seal of approval?'),
+        ),
+    ]

network-api/networkapi/buyersguide/migrations/0016_auto_20181001_1733.py

@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.14 on 2018-10-01 17:33
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('buyersguide', '0015_product_has_moz_approval'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='product',
+            name='has_moz_approval',
+            field=models.NullBooleanField(help_text='Does this product meet minimum security standards?'),
+        ),
+    ]

network-api/networkapi/buyersguide/migrations/0017_auto_20181001_1734.py

@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.14 on 2018-10-01 17:34
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('buyersguide', '0016_auto_20181001_1733'),
+    ]
+
+    operations = [
+        migrations.RenameField(
+            model_name='product',
+            old_name='has_moz_approval',
+            new_name='meets_minimum_security_standards',
+        ),
+    ]