Commit 83bfb989 authored by John Red Medrano's avatar John Red Medrano

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

* commit '6584012f':
  fixing current user
parents 3af64ebf 6584012f
...@@ -115,15 +115,15 @@ class UserManagementRetreiveSerializer(serializers.ModelSerializer): ...@@ -115,15 +115,15 @@ class UserManagementRetreiveSerializer(serializers.ModelSerializer):
# datas = rms_module # datas = rms_module
mod = data.modules.filter(~Q(name__icontains='header')) mod = data.modules.filter(~Q(name__icontains='header'))
if user.user_type.upper() != enums.UserTypeEnum.USER.value: if user.user_type.upper() != enums.UserTypeEnum.USER.value:
if user.user_type.upper() == enums.UserTypeEnum.SUPER_USER.value and str(app.code) == 'APP-20190923-0000001': if user.user_type.upper() != enums.UserTypeEnum.USER.value:
user_module = models.Module.objects.filter( user_module = models.Module.objects.filter(
name__icontains="user" name__icontains="user"
) )
mod = mod.union(mod, user_module) mod = mod.union(mod, user_module)
else: # else:
mod = user_module = models.Module.objects.filter( # mod = user_module = models.Module.objects.filter(
name__icontains="user" # name__icontains="user"
) # )
# mod = mod.exclude(parent=0) # mod = mod.exclude(parent=0)
mod = mod.order_by("parent", "sort_id") mod = mod.order_by("parent", "sort_id")
......
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