Merge branch 'product-dev' into 'product-sit'

Product dev

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

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

config/settings/base.py

@@ -26,7 +26,7 @@ BASE_DIR = os.path.dirname(
 SECRET_KEY = 'w!dkk7gc*dk#4!6ow3s1wc32%_yp$=osgybm=n0vw6k1j^sqo&'
 
 # SECURITY WARNING: don't run with debug turned on in production!
-DEBUG = False
+
 
 ALLOWED_HOSTS = ['*']
 CORS_ORIGIN_ALLOW_ALL = True
@@ -201,9 +201,12 @@ DATABASES = {
     }
 }
 
+
+
 # ****************
 # PROGRAM SETTINGS
 # ****************
+DEBUG = config['SETTINGS']['DEBUG']
 SESSION_TIMEOUT = config['SETTINGS']['SESSION_TIMEOUT']
 FRONT_END_URL = config['SETTINGS']['FRONT_END_URL']
 AUTH_ACCESSS_TOKEN_TIMEOUT = config['SETTINGS']['AUTH_ACCESSS_TOKEN_TIMEOUT']

env.new_template.ini

@@ -14,6 +14,7 @@ USER_DEFAULT_PASSWORD = password
 CATCH_EMAIL = gladys@tirsolutions.com
 CR_LINK = http://localhost:8000/cms/change-request/form/view
 REALTIMESERVER_IP = 127.0.0.1:8000
+DEBUG = True
 
 
 [NOTIFICATION_EMAIL]