javad/crmApi
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix get_user_workspace util Func

Browse Source
This commit is contained in:
javad committed 2024-01-23 10:44:11 +03:30
1 parent 7cd8ff0511
commit 4e7fa3d6ef
2 files changed
+7 -8
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

.idea/workspace.xml
Generated
+2 -6
View File
@@ -3,11 +3,7 @@
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="87c5db51-3e89-4a98-9bbb-121c9c52ab3c" name="Changes" comment=""> <list default="true" id="87c5db51-3e89-4a98-9bbb-121c9c52ab3c" name="Changes" comment="">
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/apps/cuser/models.py" beforeDir="false" afterPath="$PROJECT_DIR$/apps/cuser/models.py" afterDir="false" /> <change beforePath="$PROJECT_DIR$/utils/get_user_workspace.py" beforeDir="false" afterPath="$PROJECT_DIR$/utils/get_user_workspace.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/apps/jwt_auth/models.py" beforeDir="false" afterPath="$PROJECT_DIR$/apps/jwt_auth/models.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/apps/jwt_auth/services.py" beforeDir="false" afterPath="$PROJECT_DIR$/apps/jwt_auth/services.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/apps/jwt_auth/views.py" beforeDir="false" afterPath="$PROJECT_DIR$/apps/jwt_auth/views.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/apps/workspace/models.py" beforeDir="false" afterPath="$PROJECT_DIR$/apps/workspace/models.py" afterDir="false" />
</list> </list>
<option name="SHOW_DIALOG" value="false" /> <option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" /> <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -95,7 +91,7 @@
<workItem from="1697269439761" duration="66295000" /> <workItem from="1697269439761" duration="66295000" />
<workItem from="1702900258020" duration="63755000" /> <workItem from="1702900258020" duration="63755000" />
<workItem from="1704088148329" duration="105568000" /> <workItem from="1704088148329" duration="105568000" />
<workItem from="1704951046597" duration="80074000" /> <workItem from="1704951046597" duration="82372000" />
</task> </task>
<servers /> <servers />
</component> </component>
utils/get_user_workspace.py
+5 -2
View File
@@ -2,12 +2,15 @@ from apps.workspace.models import Workspace as WorkspaceModel
from apps.cuser.models import CuserRole as CuserRoleModel from apps.cuser.models import CuserRole as CuserRoleModel
from apps.customer.models import CustomerResponsible as CustomerResponsibleModel, Customer as CustomerModel from apps.customer.models import CustomerResponsible as CustomerResponsibleModel, Customer as CustomerModel
def get_user_workspace(request) -> WorkspaceModel: def get_user_workspace(request) -> WorkspaceModel:
jwt_payload = request.auth.payload jwt_payload = request.auth.payload
cuser_role_uuid = jwt_payload.get('cuser_role_uuid') cuser_role_uuid = jwt_payload.get('cuser_role_uuid')
# use_redis # use_redis
cuser_role = CuserRoleModel.objects.get(uuid=cuser_role_uuid) cuser_role = CuserRoleModel.objects.get(uuid=cuser_role_uuid)
role_type_name = cuser_role.role_type.role_name_en
return cuser_role.sys_ws
'''role_type_name = cuser_role.role_type.role_name_en
if role_type_name == 'workspace_operator': if role_type_name == 'workspace_operator':
operator = CustomerResponsibleModel.objects.get(cuser_role=cuser_role) operator = CustomerResponsibleModel.objects.get(cuser_role=cuser_role)
@@ -15,7 +18,7 @@ def get_user_workspace(request) -> WorkspaceModel:
return workspace return workspace
else: else:
customer = CustomerModel.objects.get(cuser_role=cuser_role) customer = CustomerModel.objects.get(cuser_role=cuser_role)
return customer.sys_ws return customer.sys_ws'''
def get_user_workspace_uuid(request) -> str: def get_user_workspace_uuid(request) -> str: