Merge pull request #510 from frappe/develop

frappe · Jan 3, 2025 · d16261e · d16261e
2 parents f9592cc + 70c5e9c
commit d16261e
Show file tree

Hide file tree

Showing 11 changed files with 175 additions and 236 deletions.
diff --git a/crm/fcrm/doctype/crm_deal/api.py b/crm/fcrm/doctype/crm_deal/api.py
@@ -10,7 +10,7 @@ def get_deal(name):
 
 	deal["fields_meta"] = get_fields_meta("CRM Deal")
 	deal["_form_script"] = get_form_script("CRM Deal")
-	deal["_assign"] = get_assigned_users("CRM Deal", deal.name, deal.owner)
+	deal["_assign"] = get_assigned_users("CRM Deal", deal.name)
 	return deal
 
 

diff --git a/crm/fcrm/doctype/crm_lead/api.py b/crm/fcrm/doctype/crm_lead/api.py
@@ -10,5 +10,5 @@ def get_lead(name):
 
 	lead["fields_meta"] = get_fields_meta("CRM Lead")
 	lead["_form_script"] = get_form_script("CRM Lead")
-	lead["_assign"] = get_assigned_users("CRM Lead", lead.name, lead.owner)
+	lead["_assign"] = get_assigned_users("CRM Lead", lead.name)
 	return lead
diff --git a/frontend/src/components/AssignTo.vue b/frontend/src/components/AssignTo.vue
@@ -0,0 +1,31 @@
+<template>
+  <component
+    v-if="assignees?.length"
+    :is="assignees?.length == 1 ? 'Button' : 'div'"
+  >
+    <MultipleAvatar :avatars="assignees" @click="showAssignmentModal = true" />
+  </component>
+  <Button v-else @click="showAssignmentModal = true">
+    {{ __('Assign to') }}
+  </Button>
+  <AssignmentModal
+    v-if="showAssignmentModal"
+    v-model="showAssignmentModal"
+    v-model:assignees="assignees"
+    :doctype="doctype"
+    :doc="data"
+  />
+</template>
+<script setup>
+import MultipleAvatar from '@/components/MultipleAvatar.vue'
+import AssignmentModal from '@/components/Modals/AssignmentModal.vue'
+import { ref } from 'vue'
+
+const props = defineProps({
+  data: Object,
+  doctype: String,
+})
+
+const showAssignmentModal = ref(false)
+const assignees = defineModel()
+</script>
diff --git a/frontend/src/components/FieldLayout.vue b/frontend/src/components/FieldLayout.vue
@@ -151,7 +151,10 @@
                     <Link
                       v-else-if="field.fieldtype === 'User'"
                       class="form-control"
-                      :value="getUser(data[field.fieldname]).full_name"
+                      :value="
+                        data[field.fieldname] &&
+                        getUser(data[field.fieldname]).full_name
+                      "
                       :doctype="field.options"
                       :filters="field.filters"
                       @change="(v) => (data[field.fieldname] = v)"
@@ -160,6 +163,7 @@
                     >
                       <template #prefix>
                         <UserAvatar
+                          v-if="data[field.fieldname]"
                           class="mr-2"
                           :user="data[field.fieldname]"
                           size="sm"

diff --git a/frontend/src/components/Modals/AssignmentModal.vue b/frontend/src/components/Modals/AssignmentModal.vue
@@ -133,10 +133,6 @@ const addValue = (value) => {
 }
 
 function updateAssignees() {
-  if (assignees.value.length === 0) {
-    error.value = 'Please select at least one assignee'
-    return
-  }
   const removedAssignees = oldAssignees.value
     .filter(
       (assignee) => !assignees.value.find((a) => a.name === assignee.name),

diff --git a/frontend/src/components/SidePanelLayout.vue b/frontend/src/components/SidePanelLayout.vue
@@ -74,7 +74,7 @@
                               field.mandatory_via_depends_on)
                           "
                           class="text-ink-red-3"
-                          >*</span
+                          > *</span
                         >
                       </div>
                     </Tooltip>

diff --git a/frontend/src/pages/Deal.vue b/frontend/src/pages/Deal.vue
@@ -9,12 +9,11 @@
     </template>
     <template #right-header>
       <CustomActions v-if="customActions" :actions="customActions" />
-      <component :is="deal.data._assignedTo?.length == 1 ? 'Button' : 'div'">
-        <MultipleAvatar
-          :avatars="deal.data._assignedTo"
-          @click="showAssignmentModal = true"
-        />
-      </component>
+      <AssignTo
+        v-model="deal.data._assignedTo"
+        :data="deal.data"
+        doctype="CRM Deal"
+      />
       <Dropdown :options="statusOptions('deal', updateField, customStatuses)">
         <template #default="{ open }">
           <Button
@@ -237,13 +236,6 @@
       afterInsert: (doc) => addContact(doc.name),
     }"
   />
-  <AssignmentModal
-    v-if="showAssignmentModal"
-    v-model="showAssignmentModal"
-    v-model:assignees="deal.data._assignedTo"
-    :doc="deal.data"
-    doctype="CRM Deal"
-  />
   <FilesUploader
     v-if="deal.data?.name"
     v-model="showFilesUploader"
@@ -278,9 +270,8 @@ import AttachmentIcon from '@/components/Icons/AttachmentIcon.vue'
 import LayoutHeader from '@/components/LayoutHeader.vue'
 import Activities from '@/components/Activities/Activities.vue'
 import OrganizationModal from '@/components/Modals/OrganizationModal.vue'
-import AssignmentModal from '@/components/Modals/AssignmentModal.vue'
+import AssignTo from '@/components/AssignTo.vue'
 import FilesUploader from '@/components/FilesUploader/FilesUploader.vue'
-import MultipleAvatar from '@/components/MultipleAvatar.vue'
 import ContactModal from '@/components/Modals/ContactModal.vue'
 import Section from '@/components/Section.vue'
 import SidePanelLayout from '@/components/SidePanelLayout.vue'
@@ -390,7 +381,6 @@ onBeforeUnmount(() => {
 
 const reload = ref(false)
 const showOrganizationModal = ref(false)
-const showAssignmentModal = ref(false)
 const showFilesUploader = ref(false)
 const _organization = ref({})
 

diff --git a/frontend/src/pages/Lead.vue b/frontend/src/pages/Lead.vue
@@ -9,12 +9,11 @@
     </template>
     <template #right-header>
       <CustomActions v-if="customActions" :actions="customActions" />
-      <component :is="lead.data._assignedTo?.length == 1 ? 'Button' : 'div'">
-        <MultipleAvatar
-          :avatars="lead.data._assignedTo"
-          @click="showAssignmentModal = true"
-        />
-      </component>
+      <AssignTo
+        v-model="lead.data._assignedTo"
+        :data="lead.data"
+        doctype="CRM Lead"
+      />
       <Dropdown :options="statusOptions('lead', updateField, customStatuses)">
         <template #default="{ open }">
           <Button
@@ -180,13 +179,6 @@
       </div>
     </Resizer>
   </div>
-  <AssignmentModal
-    v-if="showAssignmentModal"
-    v-model="showAssignmentModal"
-    v-model:assignees="lead.data._assignedTo"
-    :doc="lead.data"
-    doctype="CRM Lead"
-  />
   <Dialog
     v-model="showConvertToDealModal"
     :options="{
@@ -286,9 +278,8 @@ import ContactsIcon from '@/components/Icons/ContactsIcon.vue'
 import AttachmentIcon from '@/components/Icons/AttachmentIcon.vue'
 import LayoutHeader from '@/components/LayoutHeader.vue'
 import Activities from '@/components/Activities/Activities.vue'
-import AssignmentModal from '@/components/Modals/AssignmentModal.vue'
+import AssignTo from '@/components/AssignTo.vue'
 import FilesUploader from '@/components/FilesUploader/FilesUploader.vue'
-import MultipleAvatar from '@/components/MultipleAvatar.vue'
 import Link from '@/components/Controls/Link.vue'
 import SidePanelLayout from '@/components/SidePanelLayout.vue'
 import SLASection from '@/components/SLASection.vue'
@@ -373,7 +364,6 @@ onMounted(() => {
 })
 
 const reload = ref(false)
-const showAssignmentModal = ref(false)
 const showFilesUploader = ref(false)
 
 function updateLead(fieldname, value, callback) {