Merge branch 'develop' into feature/gm-148

apps/tag/migrations/0004_tag_priority.py

@@ -0,0 +1,18 @@
+# Generated by Django 2.2.4 on 2019-10-21 13:46
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('tag', '0003_auto_20191018_0758'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='tag',
+            name='priority',
+            field=models.IntegerField(default=None, null=True, unique=True),
+        ),
+    ]

apps/tag/models.py

@@ -14,6 +14,7 @@ class Tag(TranslatedFieldsMixin, models.Model):
     category = models.ForeignKey('TagCategory', on_delete=models.CASCADE,
                                  null=True, related_name='tags',
                                  verbose_name=_('Category'))
+    priority = models.IntegerField(unique=True, null=True, default=None)
 
     class Meta:
         """Meta class."""