accsess all to list customer
This commit is contained in:
1 parent
db708a662e
commit
fc914d6f6d
4 files changed
+25
-27
No files matched your search
Generated
+19
-21
@@ -6,8 +6,6 @@
|
|||||||
<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/lead/selectors.py" beforeDir="false" afterPath="$PROJECT_DIR$/apps/lead/selectors.py" afterDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/apps/lead/services.py" beforeDir="false" afterPath="$PROJECT_DIR$/apps/lead/services.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" />
|
||||||
@@ -39,26 +37,26 @@
|
|||||||
<option name="hideEmptyMiddlePackages" value="true" />
|
<option name="hideEmptyMiddlePackages" value="true" />
|
||||||
<option name="showLibraryContents" value="true" />
|
<option name="showLibraryContents" value="true" />
|
||||||
</component>
|
</component>
|
||||||
<component name="PropertiesComponent">{
|
<component name="PropertiesComponent"><![CDATA[{
|
||||||
"keyToString": {
|
"keyToString": {
|
||||||
"Django Server.crmApi.executor": "Run",
|
"Django Server.crmApi.executor": "Run",
|
||||||
"RunOnceActivity.OpenDjangoStructureViewOnStart": "true",
|
"RunOnceActivity.OpenDjangoStructureViewOnStart": "true",
|
||||||
"RunOnceActivity.OpenProjectViewOnStart": "true",
|
"RunOnceActivity.OpenProjectViewOnStart": "true",
|
||||||
"RunOnceActivity.ShowReadmeOnStart": "true",
|
"RunOnceActivity.ShowReadmeOnStart": "true",
|
||||||
"SHARE_PROJECT_CONFIGURATION_FILES": "true",
|
"SHARE_PROJECT_CONFIGURATION_FILES": "true",
|
||||||
"WebServerToolWindowFactoryState": "false",
|
"WebServerToolWindowFactoryState": "false",
|
||||||
"git-widget-placeholder": "dev",
|
"git-widget-placeholder": "main",
|
||||||
"ignore.virus.scanning.warn.message": "true",
|
"ignore.virus.scanning.warn.message": "true",
|
||||||
"last_opened_file_path": "C:/Users/mjavad/Projects/crmProject/Project/api-Project/crmApi",
|
"last_opened_file_path": "C:/Users/mjavad/Projects/crmProject/Project/api-Project/crmApi",
|
||||||
"node.js.detected.package.eslint": "true",
|
"node.js.detected.package.eslint": "true",
|
||||||
"node.js.detected.package.tslint": "true",
|
"node.js.detected.package.tslint": "true",
|
||||||
"node.js.selected.package.eslint": "(autodetect)",
|
"node.js.selected.package.eslint": "(autodetect)",
|
||||||
"node.js.selected.package.tslint": "(autodetect)",
|
"node.js.selected.package.tslint": "(autodetect)",
|
||||||
"nodejs_package_manager_path": "npm",
|
"nodejs_package_manager_path": "npm",
|
||||||
"settings.editor.selected.configurable": "preferences.pluginManager",
|
"settings.editor.selected.configurable": "preferences.pluginManager",
|
||||||
"vue.rearranger.settings.migration": "true"
|
"vue.rearranger.settings.migration": "true"
|
||||||
}
|
}
|
||||||
}</component>
|
}]]></component>
|
||||||
<component name="RecentsManager">
|
<component name="RecentsManager">
|
||||||
<key name="MoveFile.RECENT_KEYS">
|
<key name="MoveFile.RECENT_KEYS">
|
||||||
<recent name="E:\Projects\crmProject\Project\api-Project\crmApi\utils" />
|
<recent name="E:\Projects\crmProject\Project\api-Project\crmApi\utils" />
|
||||||
|
|||||||
@@ -77,10 +77,10 @@ def list_customer_v2(request):
|
|||||||
user_workspace_uuid = get_user_workspace_uuid(request=request)
|
user_workspace_uuid = get_user_workspace_uuid(request=request)
|
||||||
user_cuser_role_uuid = get_cuser_role_uuid(request=request)
|
user_cuser_role_uuid = get_cuser_role_uuid(request=request)
|
||||||
|
|
||||||
customer_responsible = CustomerResponsibleModel.objects.filter(cuser_role__uuid=user_cuser_role_uuid)
|
# customer_responsible = CustomerResponsibleModel.objects.filter(cuser_role__uuid=user_cuser_role_uuid)
|
||||||
|
# customer_objs = CustomerModel.objects.filter(sys_ws__uuid=user_workspace_uuid, responsible_group__customer_responsible__in=customer_responsible)
|
||||||
customer_objs = CustomerModel.objects.filter(sys_ws__uuid=user_workspace_uuid,
|
|
||||||
responsible_group__customer_responsible__in=customer_responsible)
|
customer_objs = CustomerModel.objects.filter(sys_ws__uuid=user_workspace_uuid)
|
||||||
|
|
||||||
return customer_objs
|
return customer_objs
|
||||||
except Exception as exp:
|
except Exception as exp:
|
||||||
|
|||||||
@@ -141,7 +141,7 @@ def update_lead_comment(request, lead_comment_id: int, desc: str) -> LeadModel:
|
|||||||
def create_lead_comment(request, lead_id, desc: str) -> LeadCommentModel:
|
def create_lead_comment(request, lead_id, desc: str) -> LeadCommentModel:
|
||||||
try:
|
try:
|
||||||
sys_ws = get_user_workspace(request=request)
|
sys_ws = get_user_workspace(request=request)
|
||||||
#cuser_role = get_cuser_role(request=request)
|
cuser_role = get_cuser_role(request=request)
|
||||||
|
|
||||||
lead_comment = LeadCommentModel()
|
lead_comment = LeadCommentModel()
|
||||||
#lead_comment.lead = LeadModel.objects.get(id=lead_id, sys_ws=sys_ws, cuser_role=cuser_role)
|
#lead_comment.lead = LeadModel.objects.get(id=lead_id, sys_ws=sys_ws, cuser_role=cuser_role)
|
||||||
|
|||||||
+1
-1
@@ -73,7 +73,7 @@ class LeadUpdateApi(APIView):
|
|||||||
class InputSerializer(serializers.Serializer):
|
class InputSerializer(serializers.Serializer):
|
||||||
title = serializers.CharField(max_length=100, required=True)
|
title = serializers.CharField(max_length=100, required=True)
|
||||||
customer_id = serializers.IntegerField(required=True)
|
customer_id = serializers.IntegerField(required=True)
|
||||||
desc = serializers.CharField(max_length=200, required=True)
|
desc = serializers.CharField(max_length=2000, required=True)
|
||||||
lead_type_id = serializers.IntegerField(required=True)
|
lead_type_id = serializers.IntegerField(required=True)
|
||||||
product_type_id = serializers.IntegerField(required=True)
|
product_type_id = serializers.IntegerField(required=True)
|
||||||
lead_source_id = serializers.IntegerField(required=True)
|
lead_source_id = serializers.IntegerField(required=True)
|
||||||
|
|||||||
Reference in new issue
Block a user