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

* commit 'd921ca6a':
  fixing on current user and set debug false to stagubg

app/applicationlayer/management/user/serializers.py

@@ -123,16 +123,18 @@ class UserManagementRetreiveSerializer(serializers.ModelSerializer):
         for data in app.order_by('id'):
             if data.id == 1 and user.user_type.upper() == enums.UserTypeEnum.SUPER_USER.value:
                 mod = data.modules.all()
-            if user.user_type.upper() != enums.UserTypeEnum.USER.value:
-                if user.user_type.upper() != enums.UserTypeEnum.USER.value:
-                    user_module = models.Module.objects.filter(
+            elif data.id == 1 and user.user_type.upper() != enums.UserTypeEnum.USER.value:
+                mod = user_module = models.Module.objects.filter(
                         name__icontains="user"
                     )
-                    # if data.id != 1 and user.user_type.upper() == enums.UserTypeEnum.SUPER_USER.value:
-                    if data.id == 1 and user.user_type.upper() == enums.UserTypeEnum.SUPER_USER.value:
-                        mod = mod.union(mod, user_module)
-                    else:
-                        mod = user_module
+            else:
+                mod = data.modules.all()
+            
+            if user.user_type.upper() != enums.UserTypeEnum.USER.value:
+                user_mod = user_module = models.Module.objects.filter(name__icontains="user")
+                mod = mod.union(mod, user_module)
+            else:
+                mod = mod
             mod = mod.order_by("parent", "sort_id")
 
             mod = ModuleSerializer(data=mod, many=True)

config/settings/staging.py

 from .base import *
 import configparser
 
-DEBUG = True
+DEBUG = False
 
 ALLOWED_HOSTS = ['*']