Merge branch 'product-dev' of http://42.61.118.105:7990/scm/rms/api-main-service into gladys-dev2

app/entities/migrations/0005_auto_20200115_1950.py

+# Generated by Django 2.2 on 2020-01-15 19:50
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('entities', '0004_auto_20200115_1036'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='entitylog',
+            name='entity',
+            field=models.CharField(choices=[('USER', 'USER'), ('APPLICATION', 'APPLICATION'), ('COMPANY', 'COMPANY'), ('DEPARTMENT', 'DEPARTMENT'), ('MODULE', 'MODULE'), ('DELEGATION', 'DELEGATION'), ('ChangeRequestTemplateHeader', 'ChangeRequestTemplateHeader'), ('ChangeRequestTemplateApprovers', 'ChangeRequestTemplateApprovers'), ('ChangeRequestTemplateStakeHolders', 'ChangeRequestTemplateStakeHolders'), ('ChangeRequestTemplateAttachments', 'ChangeRequestTemplateAttachments'), ('ChangeRequestTemplateDetails', 'ChangeRequestTemplateDetails'), ('ChangeRequestFormHeader', 'ChangeRequestFormHeader'), ('ChangeRequestFormApprovers', 'ChangeRequestFormApprovers'), ('ChangeRequestFormStakeHolders', 'ChangeRequestFormStakeHolders'), ('ChangeRequestFormAttachments', 'ChangeRequestFormAttachments'), ('ChangeRequestFormDetails', 'ChangeRequestFormDetails'), ('ChangeRequestSettings', 'ChangeRequestSettings')], default='Add', max_length=50),
+        ),
+        migrations.AlterUniqueTogether(
+            name='changerequestsettings',
+            unique_together={('active_user', 'behalf_user')},
+        ),
+    ]

app/entities/models.py

@@ -1263,6 +1263,7 @@ class ChangeRequestSettings(models.Model):
     class Meta:
         db_table = 'change_request_settings'
         ordering = ['-created']
+        unique_together = ['active_user', 'behalf_user']
     
     def __str__(self):
         return f'{self.code}'