From 31e3454372ae6804391ab3ad11a47fe90e9f0a74 Mon Sep 17 00:00:00 2001 From: Zlash65 Date: Thu, 15 Feb 2018 12:42:30 +0530 Subject: [PATCH 1/2] fix dl for reports --- frappe/public/js/frappe/form/controls/dynamic_link.js | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/frappe/public/js/frappe/form/controls/dynamic_link.js b/frappe/public/js/frappe/form/controls/dynamic_link.js index 3da593edb8..02e970091e 100644 --- a/frappe/public/js/frappe/form/controls/dynamic_link.js +++ b/frappe/public/js/frappe/form/controls/dynamic_link.js @@ -4,11 +4,11 @@ frappe.ui.form.ControlDynamicLink = frappe.ui.form.ControlLink.extend({ if(this.df.get_options) { options = this.df.get_options(); } - if (this.docname==null && cur_dialog) { + else if (this.docname==null && cur_dialog) { //for dialog box options = cur_dialog.get_value(this.df.options); } - if (!cur_frm) { + else if (!cur_frm) { const selector = `input[data-fieldname="${this.df.options}"]`; let input = null; if (cur_list) { @@ -22,7 +22,9 @@ frappe.ui.form.ControlDynamicLink = frappe.ui.form.ControlLink.extend({ options = input.val(); } } - options = frappe.model.get_value(this.df.parent, this.docname, this.df.options); + else { + options = frappe.model.get_value(this.df.parent, this.docname, this.df.options); + } if (frappe.model.is_single(options)) { frappe.throw(__(`${options.bold()} is not a valid DocType for Dynamic Link`)); From 24972722be6e64e92cf0d418318c13fea301b7ec Mon Sep 17 00:00:00 2001 From: Saurabh Date: Thu, 15 Feb 2018 15:48:12 +0600 Subject: [PATCH 2/2] bumped to version 10.0.24 --- frappe/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/__init__.py b/frappe/__init__.py index 456e3ddab2..1dbff97f1b 100644 --- a/frappe/__init__.py +++ b/frappe/__init__.py @@ -14,7 +14,7 @@ import os, sys, importlib, inspect, json from .exceptions import * from .utils.jinja import get_jenv, get_template, render_template, get_email_from_template -__version__ = '10.0.23' +__version__ = '10.0.24' __title__ = "Frappe Framework" local = Local()