fix: use property image_field and check for http link
This commit is contained in:
parent
d82230bcb7
commit
2c1e20496a
2 changed files with 5 additions and 3 deletions
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue