diff --git a/.idea/workspace.xml b/.idea/workspace.xml index e42e363..434bb7a 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -6,8 +6,6 @@ - - - { - "keyToString": { - "Django Server.crmApi.executor": "Run", - "RunOnceActivity.OpenDjangoStructureViewOnStart": "true", - "RunOnceActivity.OpenProjectViewOnStart": "true", - "RunOnceActivity.ShowReadmeOnStart": "true", - "SHARE_PROJECT_CONFIGURATION_FILES": "true", - "WebServerToolWindowFactoryState": "false", - "git-widget-placeholder": "dev", - "ignore.virus.scanning.warn.message": "true", - "last_opened_file_path": "C:/Users/mjavad/Projects/crmProject/Project/api-Project/crmApi", - "node.js.detected.package.eslint": "true", - "node.js.detected.package.tslint": "true", - "node.js.selected.package.eslint": "(autodetect)", - "node.js.selected.package.tslint": "(autodetect)", - "nodejs_package_manager_path": "npm", - "settings.editor.selected.configurable": "preferences.pluginManager", - "vue.rearranger.settings.migration": "true" + +}]]> diff --git a/apps/customer/selectors.py b/apps/customer/selectors.py index 213379a..1d2e1ea 100644 --- a/apps/customer/selectors.py +++ b/apps/customer/selectors.py @@ -77,10 +77,10 @@ def list_customer_v2(request): user_workspace_uuid = get_user_workspace_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_objs = CustomerModel.objects.filter(sys_ws__uuid=user_workspace_uuid, - responsible_group__customer_responsible__in=customer_responsible) + # 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) return customer_objs except Exception as exp: diff --git a/apps/lead/services.py b/apps/lead/services.py index ad6fc68..fb1e672 100644 --- a/apps/lead/services.py +++ b/apps/lead/services.py @@ -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: try: 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.lead = LeadModel.objects.get(id=lead_id, sys_ws=sys_ws, cuser_role=cuser_role) diff --git a/apps/lead/views.py b/apps/lead/views.py index da8825e..fdf3574 100644 --- a/apps/lead/views.py +++ b/apps/lead/views.py @@ -73,7 +73,7 @@ class LeadUpdateApi(APIView): class InputSerializer(serializers.Serializer): title = serializers.CharField(max_length=100, 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) product_type_id = serializers.IntegerField(required=True) lead_source_id = serializers.IntegerField(required=True)