Commit e73677eb authored by Gladys Forte's avatar Gladys Forte

RMS40 – CMS Settings Duplicate User Allowed -...

RMS40 – CMS Settings Duplicate User Allowed - http://54.169.104.100:27015/rms/Backend/api-main-service/issues/23 - cms settings not allowing duplcates user
parent 0c24faa1
...@@ -19,6 +19,7 @@ from app.applicationlayer.utils import ( ...@@ -19,6 +19,7 @@ from app.applicationlayer.utils import (
CustomPagination,status_message_response CustomPagination,status_message_response
) )
from app.helper.email_service import sender from app.helper.email_service import sender
from app.applicationlayer.utils import error_message
class CMSSettingsViewSet(viewsets.ModelViewSet): class CMSSettingsViewSet(viewsets.ModelViewSet):
...@@ -97,13 +98,19 @@ class CMSSettingsViewSet(viewsets.ModelViewSet): ...@@ -97,13 +98,19 @@ class CMSSettingsViewSet(viewsets.ModelViewSet):
logged_user = self.request.user.code logged_user = self.request.user.code
data_cms_settings = [] data_cms_settings = []
behalf_user_list = []
cms_settings = request.data['cms_settings'] cms_settings = request.data['cms_settings']
for cms_setting in cms_settings: for cms_setting in cms_settings:
cms_setting['active_user'] = logged_user if cms_setting['behalf_user'] in behalf_user_list:
data_cms_settings.append(cms_setting) 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( serializer = ChangeRequestSettingsSerializer(
data=data_cms_settings, many=True data=data_cms_settings, many=True
) )
......
...@@ -471,6 +471,14 @@ class BaseHeader(models.Model): ...@@ -471,6 +471,14 @@ class BaseHeader(models.Model):
null=True) null=True)
created = models.DateTimeField(auto_now_add=True) created = models.DateTimeField(auto_now_add=True)
is_active = models.BooleanField(default=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: class Meta:
abstract = True abstract = True
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment