Merge pull request #409 in RMS/api-main-service from gladys-dev2 to RMSv2

* commit '859c3057':
  sorting level temp approver

app/applicationlayer/cms/template/header/views.py

@@ -186,7 +186,7 @@ class ChangeRequestTemplatesViewset(viewsets.ModelViewSet):
 
         partial = kwargs.pop('partial', True)
         instance = self.get_object()
-        
+
         template_no = kwargs['template_no']
 
         body_data = request.data
@@ -198,7 +198,7 @@ class ChangeRequestTemplatesViewset(viewsets.ModelViewSet):
             serializer = self.get_serializer(instance,
                                              data=request.data,
                                              partial=partial)
-
+            
             serializer.is_valid(raise_exception=True)
             old_instance = model_to_dict(instance)
             self.perform_update(serializer)

app/entities/migrations/0024_auto_20191022_1433.py

+# Generated by Django 2.2 on 2019-10-22 14:33
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('entities', '0023_auto_20191021_1706'),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name='changerequesttemplateapprovers',
+            options={'ordering': ['level']},
+        ),
+    ]

app/entities/models.py

@@ -572,6 +572,7 @@ class ChangeRequestTemplateApprovers(BaseApprover):
     
     class Meta:
         db_table = 'change_request_template_approvers'
+        ordering = ['level']
 
     def __str__(self):
         return f'{self.code}'