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

* commit '7e294b20':
  removed password on endpoint of user list on routing table and bug fix on template user list

app/applicationlayer/cms/master/template/account/views.py

@@ -27,12 +27,7 @@ class UserListTemplate(APIView):
 
             user_list = models.User.objects.filter(
                 code__in=verified_users
-            ).annotate(
-                company_code=F('department__company__code'),
-                company_name=F('department__company__name'),
-                department_code=F('department__code'),
-                department_name=F('department__name')
-            ).values()
+            )
             print(user_list)
 
 

app/applicationlayer/management/account/serializer.py

@@ -50,6 +50,14 @@ class UserEditSerializer(serializers.ModelSerializer):
 
 class ChangeRequestList(serializers.ModelSerializer):
 
+    def to_representation(self, instance):
+        ret = super().to_representation(instance)
+        ret['company_name'] = instance.department.company.code
+        ret['company_code'] = instance.department.company.name
+        ret['department_code'] = instance.department.code
+        ret['department_name'] = instance.department.name
+        return ret
+
     class Meta:
         model = User
         fields = (

app/applicationlayer/master/Account/serializer.py

@@ -16,7 +16,8 @@ class AdminAccountSerializer(serializers.ModelSerializer):
 
     class Meta:
         model = User
-        fields = '__all__'
+        # fields = '__all__'
         read_only_fields = (
             'created', 'createdby', 'modified', 'modifiedby', 'code',
         )
+        exclude = ('password',)