From 2c1e20496a3eee6a56f0a53ce3814291e66aa29f Mon Sep 17 00:00:00 2001 From: Prssanna Desai Date: Wed, 24 Apr 2019 15:09:24 +0530 Subject: [PATCH] fix: use property image_field and check for http link --- frappe/desk/link_preview.py | 3 +-- frappe/public/js/frappe/ui/link_preview.js | 5 ++++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/frappe/desk/link_preview.py b/frappe/desk/link_preview.py index e9f27d8706..f8252f20bc 100644 --- a/frappe/desk/link_preview.py +++ b/frappe/desk/link_preview.py @@ -9,8 +9,7 @@ def get_preview_data(doctype, docname, fields): preview_fields.append(frappe.get_meta(doctype).get_title_field()) if 'name' not in fields: preview_fields.append('name') - if frappe.get_meta(doctype).has_field('image'): - preview_fields.append('image') + preview_fields.append(frappe.get_meta(doctype).image_field) preview_data = frappe.get_list(doctype, filters={ 'name': docname diff --git a/frappe/public/js/frappe/ui/link_preview.js b/frappe/public/js/frappe/ui/link_preview.js index 039d9a1895..34f318e0f6 100644 --- a/frappe/public/js/frappe/ui/link_preview.js +++ b/frappe/public/js/frappe/ui/link_preview.js @@ -16,6 +16,9 @@ frappe.ui.LinkPreview = class { if(!this.element.parents().find('.popover').length) { if(this.element.attr('href')) { this.link = this.element.attr('href'); + if(this.link.startsWith('http')) { + return; + } let details = this.get_details(); this.name = details.name; this.doctype = details.doctype; @@ -34,7 +37,7 @@ frappe.ui.LinkPreview = class { } this.popover = this.element.data("bs.popover"); - if(this.name && this.doctype && this.doctype!=='files') { + if(this.name && this.doctype) { this.setup_popover_control(e); } }