Commit fad9fb3e authored by John Red Medrano's avatar John Red Medrano

Merge pull request #117 in RMS/api-main-service from red-develop to RMSv2

* commit '6163ec53':
  display parent module only at current user endpoint
parents 5543233c 6163ec53
......@@ -99,7 +99,8 @@ class UserManagementRetreiveSerializer(serializers.ModelSerializer):
if data.id == 1:
if user.user_type.upper() == enums.UserTypeEnum.SUPER_USER.value:
rms_module = models.Module.objects.filter(
application=rms['code']
Q(application=rms['code']) &
Q(parent=0)
)
elif user.user_type.upper() != enums.UserTypeEnum.USER.value:
rms_module = models.Module.objects.filter(
......
......@@ -14,8 +14,10 @@ def custom_exception_handler(exc, context):
# Update the structure of the response data.
if response is not None:
error_message = {}
# print(exception_handler)
for key, value in response.data.items():
# print(type(value))
if type(value) == list and value[0].code == 'blank':
value = value[0].replace('This field', key)
# elif type(value) == dict:
......@@ -23,10 +25,13 @@ def custom_exception_handler(exc, context):
# print(value['non_field_errors'])
# print("value['non_field_errors']")
elif type(value) == list:
# value = f'{value[0]}({key})'
value = value[0].replace('This field', key)
else:
value = value[0]
error_message['code'] = response.status_code
error_message['status'] = 'failedkk'
error_message['status'] = 'failed'
error_message['message'] = value
response.data = error_message
......
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