Merge branch 'develop' of ssh://gl.id-east.ru:222/gm/gm-backend into develop

apps/main/migrations/0014_feature_priority.py

@@ -0,0 +1,18 @@
+# Generated by Django 2.2.4 on 2019-09-12 13:35
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('main', '0013_auto_20190901_1032'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='feature',
+            name='priority',
+            field=models.IntegerField(default=None, null=True, unique=True),
+        ),
+    ]

apps/main/models.py

@@ -161,6 +161,7 @@ class Feature(ProjectBaseMixin):
     """Feature model."""
 
     slug = models.CharField(max_length=255, unique=True)
+    priority = models.IntegerField(unique=True, null=True, default=None)
     site_settings = models.ManyToManyField(SiteSettings, through='SiteFeature')
 
     class Meta:

apps/main/serializers.py

@@ -15,6 +15,7 @@ class FeatureSerializer(serializers.ModelSerializer):
         fields = (
             'id',
             'slug',
+            'priority'
         )
 
 
@@ -22,13 +23,16 @@ class SiteFeatureSerializer(serializers.ModelSerializer):
 
     id = serializers.IntegerField(source='feature.id')
     slug = serializers.CharField(source='feature.slug')
+    priority = serializers.IntegerField(source='feature.priority')
 
     class Meta:
         """Meta class."""
         model = models.SiteFeature
         fields = ('main',
                   'id',
-                  'slug')
+                  'slug',
+                  'priority'
+                  )
 
 
 class SiteSettingsSerializer(serializers.ModelSerializer):