From 35606178f7ee0a3a3e45270fc24e01fdd73bb819 Mon Sep 17 00:00:00 2001 From: Neil Trini Lasrado Date: Wed, 5 Aug 2015 19:00:23 +0530 Subject: [PATCH 1/2] Added set value to dialog --- frappe/public/js/frappe/form/control.js | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/frappe/public/js/frappe/form/control.js b/frappe/public/js/frappe/form/control.js index 4b2e5cf7b7..747eb559b0 100644 --- a/frappe/public/js/frappe/form/control.js +++ b/frappe/public/js/frappe/form/control.js @@ -119,6 +119,16 @@ frappe.ui.form.ControlHTML = frappe.ui.form.Control.extend({ }, html: function(html) { this.$wrapper.html(html || this.get_content()); + }, + set_value: function(html) { + if(html.appendTo) { + // jquery object + html.appendTo(this.$wrapper.empty()); + } else { + // html + this.df.options = html; + this.html(html); + } } }); From 3c6d22f9b65c3148021079e138f94f4db9bc5483 Mon Sep 17 00:00:00 2001 From: Neil Trini Lasrado Date: Wed, 12 Aug 2015 20:36:27 +0530 Subject: [PATCH 2/2] Fixed issues with toggle display --- frappe/public/js/frappe/form/grid.js | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/frappe/public/js/frappe/form/grid.js b/frappe/public/js/frappe/form/grid.js index 7371d5ee7c..a4df87f059 100644 --- a/frappe/public/js/frappe/form/grid.js +++ b/frappe/public/js/frappe/form/grid.js @@ -53,6 +53,14 @@ frappe.ui.form.Grid = Class.extend({ var me = this, $rows = $(me.parent).find(".rows"), data = this.get_data(); + + if (this.frm && this.frm.docname) { + // use doc specific docfield object + this.df = frappe.meta.get_docfield(this.frm.doctype, this.df.fieldname, this.frm.docname); + } else { + // use non-doc specific docfield + this.df = frappe.meta.get_docfield(this.df.options, this.df.fieldname); + } this.docfields = frappe.meta.get_docfields(this.doctype, this.frm.docname); this.display_status = frappe.perm.get_field_display_status(this.df, this.frm.doc,