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

adjust code on current user, always add user management module per application...

adjust code on current user, always add user management module per application once the user type is not equal to USR
parent 558cefbf
...@@ -94,8 +94,6 @@ class UserManagementRetreiveSerializer(serializers.ModelSerializer): ...@@ -94,8 +94,6 @@ class UserManagementRetreiveSerializer(serializers.ModelSerializer):
rms = models.Application.objects.filter(id=1).values().first() rms = models.Application.objects.filter(id=1).values().first()
for data in app: for data in app:
# print(user.user_type.upper())
# print(data.id)
if data.id == 1: if data.id == 1:
if user.user_type.upper() == enums.UserTypeEnum.SUPER_USER.value: if user.user_type.upper() == enums.UserTypeEnum.SUPER_USER.value:
rms_module = models.Module.objects.filter( rms_module = models.Module.objects.filter(
...@@ -106,12 +104,15 @@ class UserManagementRetreiveSerializer(serializers.ModelSerializer): ...@@ -106,12 +104,15 @@ class UserManagementRetreiveSerializer(serializers.ModelSerializer):
rms_module = models.Module.objects.filter( rms_module = models.Module.objects.filter(
code="MODULE-20190919-0000006" code="MODULE-20190919-0000006"
) )
# else:
# rms_module= ''
else: else:
rms_module = data.modules.all() rms_module = data.modules.all()
# mod = mod.order_by('parent', 'sort_id') if user.user_type.upper() != enums.UserTypeEnum.USER.value:
mod = ModuleSerializer(data=rms_module, many=True) rms_module2 = models.Module.objects.filter(code="MODULE-20190919-0000006")
datas = rms_module.union(rms_module, rms_module2)
else:
datas = rms_module
mod = ModuleSerializer(data=datas, many=True)
mod.is_valid() mod.is_valid()
app_body = {} app_body = {}
......
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