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

* commit '53ebcb51':
  modify return of the current user

app/applicationlayer/management/user/serializers.py

@@ -92,23 +92,23 @@ class UserManagementRetreiveSerializer(serializers.ModelSerializer):
             # elif user.user_type.upper() == 'CUA' and data.id == 1:
             #     remove = ['Modules', 'Companies', 'Application']
             else:
-                remove = ['Module Management', 'Application Management', 'Department Management', 'Company Management', "User Management"]
+                # remove = ['Module Management', 'Application Management', 'Department Management', 'Company Management', "User Management"]
 
                 if user.user_type == 'SU':
                     mod = data.modules.all().values()
-                    remove = []
-                elif user.user_type == 'OUA':
-                    remove.remove("Company Management")
-                    remove.remove("Department Management")
-                    remove.remove("User Management")
-                elif user.user_type == 'CUA':
-                    remove.remove("Department Management")
-                    remove.remove("User Management")
-                elif user.user_type == 'DUA':
-                    remove.remove("User Management")
+                    # remove = []
+                # elif user.user_type == 'OUA':
+                #     remove.remove("Company Management")
+                #     remove.remove("Department Management")
+                #     remove.remove("User Management")
+                # elif user.user_type == 'CUA':
+                #     remove.remove("Department Management")
+                #     remove.remove("User Management")
+                # elif user.user_type == 'DUA':
+                #     remove.remove("User Management")
                 else:
-                    remove.remove("User Management")
-                mod = data.modules.exclude(name__in=remove).values()
+                    mod = data.modules.filter(name="User Management").values()
+                # mod = data.modules.exclude(name__in=remove).values()
                 mod = mod.order_by('parent', 'sort_id')
 
                 app_body = {}