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

Merge pull request #636 in RMS/api-main-service from red-develop to product-dev

* commit 'fec3c50f':
  fixed issue on current user
  added cms_settings key on current user endpoint
parents c51f9b68 fec3c50f
...@@ -8,7 +8,8 @@ from app.entities import enums ...@@ -8,7 +8,8 @@ from app.entities import enums
from django.db.models import Q from django.db.models import Q
from app.applicationlayer.management.module.serializer import ModuleSerializer from app.applicationlayer.management.module.serializer import ModuleSerializer
from app.entities.models import ( from app.entities.models import (
User, Department, UserImage, AllowedCompany, Application, Module User, Department, UserImage, AllowedCompany, Application, Module,
ChangeRequestSettings
) )
...@@ -19,6 +20,7 @@ class UserManagementRetreiveSerializer(serializers.ModelSerializer): ...@@ -19,6 +20,7 @@ class UserManagementRetreiveSerializer(serializers.ModelSerializer):
company = serializers.SerializerMethodField() company = serializers.SerializerMethodField()
create_form = serializers.SerializerMethodField() create_form = serializers.SerializerMethodField()
create_template = serializers.SerializerMethodField() create_template = serializers.SerializerMethodField()
cms_settings = serializers.SerializerMethodField()
class Meta: class Meta:
model = User model = User
...@@ -33,10 +35,31 @@ class UserManagementRetreiveSerializer(serializers.ModelSerializer): ...@@ -33,10 +35,31 @@ class UserManagementRetreiveSerializer(serializers.ModelSerializer):
'email', 'default_app', 'email', 'default_app',
'user_type', 'is_active', 'user_type', 'is_active',
'doa', 'doa',
'cms_settings',
) )
# exclude = ['password', 'application', 'groups', 'user_permissions'] # exclude = ['password', 'application', 'groups', 'user_permissions']
def get_cms_settings(self, user):
data = ChangeRequestSettings.objects.filter(
behalf_user=str(user.code)
).values(
'active_user__name',
'active_user__code',
# 'behalf_user__name',
# 'behalf_user__code',
'behalf_approved',
'behalf_accepted',
'behalf_rejected',
'behalf_implemented',
'behalf_completed',
)
print(user.code)
return data
def get_department(self, user): def get_department(self, user):
data = { data = {
"id": user.department.id, "id": user.department.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