Merge branch 'prod-dev-gladys' into 'product-dev'

RMS40 – CMS Settings Duplicate User Allowed -...

See merge request rms/Backend/api-main-service!805

app/applicationlayer/cms/cms_settings/views.py

@@ -19,6 +19,7 @@ from app.applicationlayer.utils import (
     CustomPagination,status_message_response
 )
 from app.helper.email_service import sender
+from app.applicationlayer.utils import error_message
 
 
 class CMSSettingsViewSet(viewsets.ModelViewSet):
@@ -97,13 +98,19 @@ class CMSSettingsViewSet(viewsets.ModelViewSet):
             logged_user = self.request.user.code
             
             data_cms_settings = []
+            behalf_user_list = []
             
             cms_settings = request.data['cms_settings']
             for cms_setting in cms_settings:
-
-                cms_setting['active_user'] = logged_user
-                data_cms_settings.append(cms_setting)
-
+                
+                if cms_setting['behalf_user'] in behalf_user_list:
+                    return error_message('400', 'Please make sure to add unique on behalf users',
+                        'failed', status.HTTP_400_BAD_REQUEST)
+                else:
+                    behalf_user_list.append(cms_setting['behalf_user'])
+                    cms_setting['active_user'] = logged_user
+                    data_cms_settings.append(cms_setting)
+            
             serializer = ChangeRequestSettingsSerializer(
                 data=data_cms_settings, many=True
             )

app/entities/models.py

@@ -471,6 +471,14 @@ class BaseHeader(models.Model):
         null=True)
     created = models.DateTimeField(auto_now_add=True)
     is_active = models.BooleanField(default=True)
+    html_obj = models.TextField(
+        blank=True,
+        null=True
+    )
+    html_desc = models.TextField(
+        blank=True,
+        null=True
+    )
 
     class Meta:
         abstract = True