From ea92af6244984c9bcd271411624228b6e9ba7ef1 Mon Sep 17 00:00:00 2001 From: Shariq Ansari Date: Mon, 29 Apr 2024 22:56:22 +0530 Subject: [PATCH 1/5] fix: truncate field label --- frontend/src/components/SectionFields.vue | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/frontend/src/components/SectionFields.vue b/frontend/src/components/SectionFields.vue index 914d4c73..fb335158 100644 --- a/frontend/src/components/SectionFields.vue +++ b/frontend/src/components/SectionFields.vue @@ -6,10 +6,12 @@ :class="[field.hidden && 'hidden']" class="flex items-center gap-2 px-3 leading-5 first:mt-3" > -
- {{ __(field.label) }} - {{ field.reqd ? ' *' : '' }} -
+ +
+ {{ __(field.label) }} + {{ field.reqd ? ' *' : '' }} +
+
From 31d535d7c9c00581156e3e5d930896238d15dd51 Mon Sep 17 00:00:00 2001 From: Shariq Ansari Date: Mon, 29 Apr 2024 23:04:23 +0530 Subject: [PATCH 2/5] fix: truncate sidebar item label & transalation refactor --- .../src/components/Layouts/AppSidebar.vue | 8 +++--- frontend/src/components/SidebarLink.vue | 26 ++++++++++--------- 2 files changed, 18 insertions(+), 16 deletions(-) diff --git a/frontend/src/components/Layouts/AppSidebar.vue b/frontend/src/components/Layouts/AppSidebar.vue index cf5a240a..94059457 100644 --- a/frontend/src/components/Layouts/AppSidebar.vue +++ b/frontend/src/components/Layouts/AppSidebar.vue @@ -10,7 +10,7 @@
-
- +
+ - - {{ label }} - + + + {{ __(label) }} + +
From 88cc4f47214f3cb1e68b28b9187dac620544e536 Mon Sep 17 00:00:00 2001 From: Shariq Ansari Date: Mon, 29 Apr 2024 23:35:02 +0530 Subject: [PATCH 3/5] chore: added open in portal link in lead/deal desk page --- crm/fcrm/doctype/crm_deal/crm_deal.js | 10 +++++----- crm/fcrm/doctype/crm_lead/crm_lead.js | 10 +++++----- frontend/src/components/Modals/DealModal.vue | 2 +- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/crm/fcrm/doctype/crm_deal/crm_deal.js b/crm/fcrm/doctype/crm_deal/crm_deal.js index 1b305ae0..944ac6d4 100644 --- a/crm/fcrm/doctype/crm_deal/crm_deal.js +++ b/crm/fcrm/doctype/crm_deal/crm_deal.js @@ -1,8 +1,8 @@ // Copyright (c) 2023, Frappe Technologies Pvt. Ltd. and contributors // For license information, please see license.txt -// frappe.ui.form.on("CRM Deal", { -// refresh(frm) { - -// }, -// }); +frappe.ui.form.on("CRM Deal", { + refresh(frm) { + frm.add_web_link(`/crm/deals/${frm.doc.name}`, __("Open in Portal")); + }, +}); diff --git a/crm/fcrm/doctype/crm_lead/crm_lead.js b/crm/fcrm/doctype/crm_lead/crm_lead.js index 0b354d77..0a9d57e1 100644 --- a/crm/fcrm/doctype/crm_lead/crm_lead.js +++ b/crm/fcrm/doctype/crm_lead/crm_lead.js @@ -1,8 +1,8 @@ // Copyright (c) 2023, Frappe Technologies Pvt. Ltd. and contributors // For license information, please see license.txt -// frappe.ui.form.on("CRM Lead", { -// refresh(frm) { - -// }, -// }); +frappe.ui.form.on("CRM Lead", { + refresh(frm) { + frm.add_web_link(`/crm/leads/${frm.doc.name}`, __("Open in Portal")); + }, +}); diff --git a/frontend/src/components/Modals/DealModal.vue b/frontend/src/components/Modals/DealModal.vue index fbfcf1b1..d82a4b95 100644 --- a/frontend/src/components/Modals/DealModal.vue +++ b/frontend/src/components/Modals/DealModal.vue @@ -17,7 +17,7 @@
- +