From 1a47127089e63318cbeaeddd10925d2991e18df5 Mon Sep 17 00:00:00 2001 From: Rohit Waghchaure Date: Mon, 3 Jul 2017 17:00:09 +0530 Subject: [PATCH 1/4] [Fix] On selection standard reply, data not fetching in email body --- frappe/public/js/frappe/views/communication.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/frappe/public/js/frappe/views/communication.js b/frappe/public/js/frappe/views/communication.js index f2475d83fd..63be096570 100755 --- a/frappe/public/js/frappe/views/communication.js +++ b/frappe/public/js/frappe/views/communication.js @@ -156,8 +156,9 @@ frappe.views.CommunicationComposer = Class.extend({ setup_standard_reply: function() { var me = this; - this.dialog.get_input("standard_reply").on("change", function() { - var standard_reply = $(this).val(); + + this.dialog.fields_dict["standard_reply"].df.onchange = () => { + var standard_reply = me.dialog.fields_dict.standard_reply.$input.val(); var prepend_reply = function(reply) { if(me.reply_added===standard_reply) { @@ -194,8 +195,7 @@ frappe.views.CommunicationComposer = Class.extend({ prepend_reply(r.message); } }); - - }); + } }, setup_last_edited_communication: function() { From fbf676e113c720042f38a5ef5dd44893b9e4258a Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Mon, 3 Jul 2017 18:19:07 +0530 Subject: [PATCH 2/4] [fix] standard filters --- frappe/public/js/frappe/ui/base_list.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/frappe/public/js/frappe/ui/base_list.js b/frappe/public/js/frappe/ui/base_list.js index 21b10339fc..80ea720dca 100644 --- a/frappe/public/js/frappe/ui/base_list.js +++ b/frappe/public/js/frappe/ui/base_list.js @@ -194,8 +194,9 @@ frappe.ui.BaseList = Class.extend({ this.meta.fields.forEach(function(df) { if(df.in_standard_filter && !frappe.model.no_value_type.includes(df.fieldtype)) { + let options = df.options; if(df.fieldtype == "Select" && df.options) { - var options = df.options.split("\n") + options = df.options.split("\n") if(options.length > 0 && options[0] != ""){ options.unshift(""); df.options = options.join("\n"); From e2d644803e666b507c8562e131e3750977de7a7c Mon Sep 17 00:00:00 2001 From: rohitwaghchaure Date: Mon, 3 Jul 2017 18:29:01 +0530 Subject: [PATCH 3/4] [Fix] Activity page is not working (#3601) * [Fix] Activity page is not working * Update base_list.js --- frappe/public/js/frappe/ui/base_list.js | 54 +++++++++++++------------ 1 file changed, 28 insertions(+), 26 deletions(-) diff --git a/frappe/public/js/frappe/ui/base_list.js b/frappe/public/js/frappe/ui/base_list.js index 80ea720dca..137ebfea83 100644 --- a/frappe/public/js/frappe/ui/base_list.js +++ b/frappe/public/js/frappe/ui/base_list.js @@ -184,33 +184,35 @@ frappe.ui.BaseList = Class.extend({ return; } - this.page.add_field({ - fieldtype:'Link', - options:this.doctype, - label:'ID', - fieldname:'name', - onchange: () => { me.refresh(true); } - }); - - this.meta.fields.forEach(function(df) { - if(df.in_standard_filter && !frappe.model.no_value_type.includes(df.fieldtype)) { - let options = df.options; - if(df.fieldtype == "Select" && df.options) { - options = df.options.split("\n") - if(options.length > 0 && options[0] != ""){ - options.unshift(""); - df.options = options.join("\n"); + if(this.meta) { + this.page.add_field({ + fieldtype:'Link', + options:this.doctype, + label:'ID', + fieldname:'name', + onchange: () => { me.refresh(true); } + }); + + this.meta.fields.forEach(function(df) { + if(df.in_standard_filter && !frappe.model.no_value_type.includes(df.fieldtype)) { + let options = df.options; + if(df.fieldtype == "Select" && df.options) { + options = df.options.split("\n") + if(options.length > 0 && options[0] != ""){ + options.unshift(""); + df.options = options.join("\n"); + } } + me.page.add_field({ + fieldtype: df.fieldtype, + label: __(df.label), + options: df.options, + fieldname: df.fieldname, + onchange: () => {me.refresh(true);} + }); } - me.page.add_field({ - fieldtype: df.fieldtype, - label: __(df.label), - options: df.options, - fieldname: df.fieldname, - onchange: () => {me.refresh(true);} - }); - } - }); + }); + } this.page.page_form.on('change', ':input', function() { me.refresh(true); @@ -507,4 +509,4 @@ frappe.ui.BaseList = Class.extend({ } }); } -}); \ No newline at end of file +}); From 5036cafb981f4dd6544f9cf83efe34e6fd39b0f2 Mon Sep 17 00:00:00 2001 From: Saurabh Date: Mon, 3 Jul 2017 19:05:03 +0600 Subject: [PATCH 4/4] bumped to version 8.2.5 --- frappe/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/__init__.py b/frappe/__init__.py index d1c5bc04e7..d6a9af8ffc 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 -__version__ = '8.2.4' +__version__ = '8.2.5' __title__ = "Frappe Framework" local = Local()