Commit 558cefbf authored by John Red Medrano's avatar John Red Medrano

change the value of user type, adjust code on create user

parent eee539e6
...@@ -57,8 +57,8 @@ class UserViewSet(viewsets.ModelViewSet): ...@@ -57,8 +57,8 @@ class UserViewSet(viewsets.ModelViewSet):
if request.data['user_type'] != 'USR': if request.data['user_type'] != 'USR':
rms = Application.objects.filter(id=1).values('code').first() rms = Application.objects.filter(id=1).values('code').first()
app.append(rms['code']) app.append(rms['code'])
else: # else:
app = request.data['application'] # app = request.data['application']
......
...@@ -12,6 +12,12 @@ class UserTypeViewSet(APIView): ...@@ -12,6 +12,12 @@ class UserTypeViewSet(APIView):
enums_department = enums.UserTypeEnum.DEPARTMENT_USER_ADMIN.value enums_department = enums.UserTypeEnum.DEPARTMENT_USER_ADMIN.value
enums_user = enums.UserTypeEnum.USER.value enums_user = enums.UserTypeEnum.USER.value
enums_super_key = str(enums.UserTypeEnum.SUPER_USER.name).replace('_',' ')
enums_OUA_key = str(enums.UserTypeEnum.OVERALL_USER_ADMIN.name).replace('_',' ')
enums_company_key = str(enums.UserTypeEnum.COMPANY_USER_ADMIN.name).replace('_',' ')
enums_department_key = str(enums.UserTypeEnum.DEPARTMENT_USER_ADMIN.name).replace('_',' ')
enums_user_key = str(enums.UserTypeEnum.USER.name).replace('_',' ')
data = { data = {
"code": "200", "code": "200",
"status": "success", "status": "success",
...@@ -19,11 +25,11 @@ class UserTypeViewSet(APIView): ...@@ -19,11 +25,11 @@ class UserTypeViewSet(APIView):
"results": "results":
# [ # [
{ {
str(enums.UserTypeEnum.SUPER_USER.name) : enums_super, enums_super_key : enums_super,
str(enums.UserTypeEnum.OVERALL_USER_ADMIN.name) : enums_OUA, enums_OUA_key : enums_OUA,
str(enums.UserTypeEnum.COMPANY_USER_ADMIN.name) : enums_company, enums_company_key : enums_company,
str(enums.UserTypeEnum.DEPARTMENT_USER_ADMIN.name) : enums_department, enums_department_key : enums_department,
str(enums.UserTypeEnum.USER.name) : enums_user enums_user_key : enums_user
} }
# ] # ]
} }
......
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