lead accsess for all operator

.idea/workspace.xml

@@ -6,12 +6,8 @@
   <component name="ChangeListManager">
     <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$/apps/lead/admin.py" beforeDir="false" afterPath="$PROJECT_DIR$/apps/lead/admin.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/apps/lead/models.py" beforeDir="false" afterPath="$PROJECT_DIR$/apps/lead/models.py" 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/serializers.py" beforeDir="false" afterPath="$PROJECT_DIR$/apps/lead/serializers.py" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/apps/lead/services.py" beforeDir="false" afterPath="$PROJECT_DIR$/apps/lead/services.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/apps/lead/views.py" beforeDir="false" afterPath="$PROJECT_DIR$/apps/lead/views.py" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -162,6 +158,7 @@
       <workItem from="1724504786406" duration="1429000" />
       <workItem from="1724678669565" duration="55000" />
       <workItem from="1724678749300" duration="2110000" />
+      <workItem from="1727674001765" duration="421000" />
     </task>
     <servers />
   </component>

apps/lead/selectors.py

@@ -18,8 +18,8 @@ def list_leads(request) -> LeadModel:
             'sys_ws__uuid': workspace_uuid,
         }
 
-        if not cuser_role.is_admin:
+        #if not cuser_role.is_admin:
-            base_filter['cuser_role__uuid'] = cuser_role_uuid
+        #    base_filter['cuser_role__uuid'] = cuser_role_uuid
 
         leads = LeadModel.objects.filter(**base_filter).order_by('-created_at')
 
@@ -40,8 +40,8 @@ def retrieve_lead(request, id: int) -> LeadModel:
             'sys_ws__uuid': workspace_uuid,
         }
 
-        if not cuser_role.is_admin:
+        #if not cuser_role.is_admin:
-            base_filter['cuser_role__uuid'] = cuser_role_uuid
+        #    base_filter['cuser_role__uuid'] = cuser_role_uuid
 
         lead = LeadModel.objects.get(id=id, **base_filter)
         return lead

apps/lead/services.py

@@ -68,7 +68,7 @@ def update_lead(request, lead_id: int, title: str, customer_id: str, desc: str,
                     lead_type_id: int, lead_source_id: int, city_id: int, lead_step_id: int, mobile1: int = None, mobile2: int = None, phone: int = None) -> LeadModel:
     try:
         sys_ws = get_user_workspace(request=request)
-        cuser_role = get_cuser_role(request=request)
+        #cuser_role = get_cuser_role(request=request)
 
         customer = ObjectValidationById(object_model=CustomerModel, request=request).is_valid(int(customer_id))
         lead_type = ObjectValidationById(object_model=LeadTypeModel, request=request).is_valid(lead_type_id)
@@ -77,7 +77,8 @@ def update_lead(request, lead_id: int, title: str, customer_id: str, desc: str,
         product_type = ObjectValidationById(object_model=ProductTypeModel, request=request).is_valid(product_type_id)
         city = ObjectValidationById(object_model=CityModel, request=request).is_valid(city_id)
 
-        lead = LeadModel.objects.get(id=lead_id, sys_ws=sys_ws, cuser_role=cuser_role)
+        #lead = LeadModel.objects.get(id=lead_id, sys_ws=sys_ws, cuser_role=cuser_role)
+        lead = LeadModel.objects.get(id=lead_id, sys_ws=sys_ws)
         lead.title = title
         lead.customer = customer
         if mobile1:
@@ -122,9 +123,10 @@ def update_lead_status(request, lead_id: int, status: str) -> LeadModel:
 def update_lead_comment(request, lead_comment_id: int, desc: str) -> LeadModel:
     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.objects.get(id=lead_comment_id, sys_ws=sys_ws, cuser_role=cuser_role)
+        #lead_comment = LeadCommentModel.objects.get(id=lead_comment_id, sys_ws=sys_ws, cuser_role=cuser_role)
+        lead_comment = LeadCommentModel.objects.get(id=lead_comment_id, sys_ws=sys_ws)
         lead_comment.desc = desc
 
         lead_comment.save()
@@ -139,10 +141,11 @@ 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)
+        #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)
         lead_comment.sys_ws = sys_ws
         lead_comment.cuser_role = cuser_role
         lead_comment.desc = desc
@@ -158,9 +161,10 @@ def create_lead_comment(request, lead_id, desc: str) -> LeadCommentModel:
 def delete_lead_comment(request, lead_comment_id: int) -> LeadModel:
     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.objects.get(id=lead_comment_id, sys_ws=sys_ws, cuser_role=cuser_role)
+        #lead_comment = LeadCommentModel.objects.get(id=lead_comment_id, sys_ws=sys_ws, cuser_role=cuser_role)
+        lead_comment = LeadCommentModel.objects.get(id=lead_comment_id, sys_ws=sys_ws)
         lead_comment.delete()
 
         return lead_comment