From 0685a56a53a8124c6e2d6d7d306d20e2bfbadc11 Mon Sep 17 00:00:00 2001 From: pratu16x7 Date: Wed, 8 Nov 2017 18:01:45 +0530 Subject: [PATCH 1/4] [minor][hotfix] initialize script property in page.py --- frappe/core/doctype/page/page.py | 1 + 1 file changed, 1 insertion(+) diff --git a/frappe/core/doctype/page/page.py b/frappe/core/doctype/page/page.py index 865bba2b1f..813eb01a0a 100644 --- a/frappe/core/doctype/page/page.py +++ b/frappe/core/doctype/page/page.py @@ -97,6 +97,7 @@ class Page(Document): def load_assets(self): from frappe.modules import get_module_path, scrub import os + self.script = '' page_name = scrub(self.name) From 192037842d265e06029212904badb9f0ec14ce6b Mon Sep 17 00:00:00 2001 From: Prateeksha Singh Date: Fri, 10 Nov 2017 11:33:10 +0530 Subject: [PATCH 2/4] [hotfix] Dynamic Link in list filters (#4455) * fix dynamic link in list filters * search parent in cur_page if not in cur_list --- frappe/public/js/frappe/form/controls/dynamic_link.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/frappe/public/js/frappe/form/controls/dynamic_link.js b/frappe/public/js/frappe/form/controls/dynamic_link.js index 7c1b24409e..650ab175cd 100644 --- a/frappe/public/js/frappe/form/controls/dynamic_link.js +++ b/frappe/public/js/frappe/form/controls/dynamic_link.js @@ -9,7 +9,11 @@ frappe.ui.form.ControlDynamicLink = frappe.ui.form.ControlLink.extend({ } if (cur_frm==null && cur_list){ //for list page - return cur_list.wrapper.find("input[data-fieldname*="+this.df.options+"]").val(); + let list_filter = cur_list.wrapper.find("input[data-fieldname*="+this.df.options+"]"); + if(list_filter.length > 0) { + return list_filter.val(); + } + return $(cur_page.page).find("input[data-fieldname*="+this.df.options+"]").val(); } var options = frappe.model.get_value(this.df.parent, this.docname, this.df.options); // if(!options) { From e8f4c16c7c3191227fe507ff101e0106ce682f24 Mon Sep 17 00:00:00 2001 From: Yaqin Shurrab Date: Fri, 10 Nov 2017 08:30:26 +0200 Subject: [PATCH 3/4] [hotfix] bring throttling limit from site_config rather than a fixed "60" (#4400) * bring throttling limit from site_config rather than from a fixed 60 * update key --- frappe/core/doctype/user/user.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/frappe/core/doctype/user/user.py b/frappe/core/doctype/user/user.py index 857019964d..7a224719f8 100644 --- a/frappe/core/doctype/user/user.py +++ b/frappe/core/doctype/user/user.py @@ -982,5 +982,6 @@ def reset_otp_secret(user): def throttle_user_creation(): if frappe.flags.in_import: return - if frappe.db.get_creation_count('User', 60) > 60: - frappe.throw(_('Throttled')) \ No newline at end of file + + if frappe.db.get_creation_count('User', 60) > frappe.local.conf.get("throttle_user_limit", 60): + frappe.throw(_('Throttled')) From 84cfd7c68276322cf6ab681ff7942086c44fb7fd Mon Sep 17 00:00:00 2001 From: Saurabh Date: Fri, 10 Nov 2017 13:39:42 +0600 Subject: [PATCH 4/4] bumped to version 9.2.10 --- frappe/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/__init__.py b/frappe/__init__.py index 8e2dceb3af..164ca9b6fc 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__ = '9.2.9' +__version__ = '9.2.10' __title__ = "Frappe Framework" local = Local()