From 6f2b58c095820578830ec9d3989f3b97419a09c1 Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Mon, 25 Apr 2016 17:53:13 +0530 Subject: [PATCH] [fix] control.js for read only values --- frappe/build.py | 4 ++-- frappe/client.py | 2 ++ frappe/public/js/frappe/form/control.js | 14 ++++++++++---- frappe/public/js/frappe/form/layout.js | 1 - 4 files changed, 14 insertions(+), 7 deletions(-) diff --git a/frappe/build.py b/frappe/build.py index b91f8e85e4..e300e19850 100644 --- a/frappe/build.py +++ b/frappe/build.py @@ -96,9 +96,9 @@ def get_build_maps(): source_paths.append(s) build_maps[target] = source_paths - except Exception: + except ValueError, e: print path - raise + print 'JSON syntax error {0}'.format(str(e)) return build_maps diff --git a/frappe/client.py b/frappe/client.py index 745523df51..94723b66fe 100644 --- a/frappe/client.py +++ b/frappe/client.py @@ -165,6 +165,8 @@ def get_js(src): with open(contentpath, "r") as srcfile: code = frappe.utils.cstr(srcfile.read()) + print code + if frappe.local.lang != "en": messages = frappe.get_lang_dict("jsfile", contentpath) messages = json.dumps(messages) diff --git a/frappe/public/js/frappe/form/control.js b/frappe/public/js/frappe/form/control.js index 6a3aac95a3..896cf22387 100644 --- a/frappe/public/js/frappe/form/control.js +++ b/frappe/public/js/frappe/form/control.js @@ -103,9 +103,15 @@ frappe.ui.form.Control = Class.extend({ }, get_parsed_value: function() { var me = this; - return this.get_value ? - (this.parse ? this.parse(this.get_value()) : this.get_value()) : - undefined; + if(this.get_status()==='Write') { + return this.get_value ? + (this.parse ? this.parse(this.get_value()) : this.get_value()) : + undefined; + } else if(this.get_status()==='Read') { + return this.value || undefined; + } else { + return undefined; + } }, set_model_value: function(value) { if(this.frm) { @@ -411,7 +417,7 @@ frappe.ui.form.ControlData = frappe.ui.form.ControlInput.extend({ this.set_mandatory && this.set_mandatory(value); }, get_value: function() { - return this.$input && this.$input.val() || this.value; + return this.$input ? this.$input.val() : undefined; }, format_for_input: function(val) { return val==null ? "" : val; diff --git a/frappe/public/js/frappe/form/layout.js b/frappe/public/js/frappe/form/layout.js index 665c0b5aad..1656d06b4f 100644 --- a/frappe/public/js/frappe/form/layout.js +++ b/frappe/public/js/frappe/form/layout.js @@ -39,7 +39,6 @@ frappe.ui.form.Layout = Class.extend({ // wrap in a block html = '
' + html + '
'; } - console.log(html); $(html).appendTo(this.message.removeClass('hidden')); } else { this.message.empty().addClass('hidden');