fix: remove website validation

frappe · Sep 17, 2024 · 8bf88a2 · 8bf88a2
1 parent c9a9d19
commit 8bf88a2
Show file tree

Hide file tree

Showing 7 changed files with 26 additions and 14 deletions.
diff --git a/crm/fcrm/doctype/crm_deal/crm_deal.json b/crm/fcrm/doctype/crm_deal/crm_deal.json
@@ -80,8 +80,7 @@
  "fetch_from": ".website",
  "fieldname": "website",
  "fieldtype": "Data",
- "label": "Website",
- "options": "URL"
+ "label": "Website"
  },
  {
  "fieldname": "close_date",
@@ -339,7 +338,7 @@
  ],
  "index_web_pages_for_search": 1,
  "links": [],
- "modified": "2024-09-16 19:44:19.553715",
+ "modified": "2024-09-17 18:34:15.873610",
  "modified_by": "Administrator",
  "module": "FCRM",
  "name": "CRM Deal",

diff --git a/crm/fcrm/doctype/crm_lead/crm_lead.json b/crm/fcrm/doctype/crm_lead/crm_lead.json
@@ -107,8 +107,7 @@
  {
  "fieldname": "website",
  "fieldtype": "Data",
- "label": "Website",
- "options": "URL"
+ "label": "Website"
  },
  {
  "fieldname": "mobile_no",
@@ -291,7 +290,7 @@
  "image_field": "image",
  "index_web_pages_for_search": 1,
  "links": [],
- "modified": "2024-09-16 19:46:01.307171",
+ "modified": "2024-09-17 18:36:57.289897",
  "modified_by": "Administrator",
  "module": "FCRM",
  "name": "CRM Lead",

diff --git a/crm/fcrm/doctype/crm_organization/crm_organization.json b/crm/fcrm/doctype/crm_organization/crm_organization.json
@@ -28,8 +28,7 @@
  {
  "fieldname": "website",
  "fieldtype": "Data",
- "label": "Website",
- "options": "URL"
+ "label": "Website"
  },
  {
  "fieldname": "organization_logo",
@@ -80,7 +79,7 @@
  "image_field": "organization_logo",
  "index_web_pages_for_search": 1,
  "links": [],
- "modified": "2024-09-13 15:52:05.106389",
+ "modified": "2024-09-17 18:37:10.341062",
  "modified_by": "Administrator",
  "module": "FCRM",
  "name": "CRM Organization",

diff --git a/frontend/src/pages/Deals.vue b/frontend/src/pages/Deals.vue
@@ -290,6 +290,7 @@ import {
  dateFormat,
  dateTooltipFormat,
  timeAgo,
+ website,
  formatNumberIntoCurrency,
  formatTime,
 } from '@/utils'
@@ -394,6 +395,8 @@ function parseRows(rows) {
  label: deal.organization,
  logo: getOrganization(deal.organization)?.organization_logo,
  }
+ } else if (row === 'website') {
+ _rows[row] = website(deal.website)
  } else if (row == 'annual_revenue') {
  _rows[row] = formatNumberIntoCurrency(
  deal.annual_revenue,

diff --git a/frontend/src/pages/Leads.vue b/frontend/src/pages/Leads.vue
@@ -307,7 +307,13 @@ import { globalStore } from '@/stores/global'
 import { usersStore } from '@/stores/users'
 import { statusesStore } from '@/stores/statuses'
 import { callEnabled } from '@/composables/settings'
-import { dateFormat, dateTooltipFormat, timeAgo, formatTime } from '@/utils'
+import {
+ dateFormat,
+ dateTooltipFormat,
+ timeAgo,
+ website,
+ formatTime,
+} from '@/utils'
 import { Avatar, Tooltip, Dropdown } from 'frappe-ui'
 import { useRoute } from 'vue-router'
 import { ref, computed, reactive, h } from 'vue'
@@ -411,6 +417,8 @@ function parseRows(rows) {
  }
  } else if (row == 'organization') {
  _rows[row] = lead.organization
+ } else if (row === 'website') {
+ _rows[row] = website(lead.website)
  } else if (row == 'status') {
  _rows[row] = {
  label: lead.status,

diff --git a/frontend/src/pages/Organizations.vue b/frontend/src/pages/Organizations.vue
@@ -82,6 +82,7 @@ import {
  dateFormat,
  dateTooltipFormat,
  timeAgo,
+ website,
  formatNumberIntoCurrency,
 } from '@/utils'
 import { ref, computed } from 'vue'
@@ -130,8 +131,4 @@ const rows = computed(() => {
  return _rows
  })
 })
-
-function website(url) {
- return url && url.replace(/^(?:https?:\/\/)?(?:www\.)?/i, '')
-}
 </script>
diff --git a/frontend/src/utils/index.js b/frontend/src/utils/index.js
@@ -72,9 +72,16 @@ export function taskPriorityOptions(action, data) {
 }
 
 export function openWebsite(url) {
+ if (!url.startsWith('http://') && !url.startsWith('https://')) {
+ url = 'https://' + url
+ }
  window.open(url, '_blank')
 }
 
+export function website(url) {
+ return url && url.replace(/^(?:https?:\/\/)?(?:www\.)?/i, '')
+}
+
 export function htmlToText(html) {
  const div = document.createElement('div')
  div.innerHTML = html