diff --git a/frappe/cache_manager.py b/frappe/cache_manager.py index 50161751aa..616b0ad03b 100644 --- a/frappe/cache_manager.py +++ b/frappe/cache_manager.py @@ -49,6 +49,10 @@ def clear_defaults_cache(user=None): elif frappe.flags.in_install!="frappe": frappe.cache().delete_key("defaults") +def clear_document_cache(): + frappe.local.document_cache = {} + frappe.cache().delete_key("document_cache") + def clear_doctype_cache(doctype=None): cache = frappe.cache() @@ -82,3 +86,6 @@ def clear_doctype_cache(doctype=None): for name in groups: cache.delete_value(name) + # Clear all document's cache. To clear documents of a specific DocType document_cache should be restructured + clear_document_cache() + diff --git a/frappe/core/doctype/activity_log/feed.py b/frappe/core/doctype/activity_log/feed.py index cc04feef66..b4d46eb5c1 100644 --- a/frappe/core/doctype/activity_log/feed.py +++ b/frappe/core/doctype/activity_log/feed.py @@ -75,8 +75,8 @@ def get_feed_match_conditions(user=None, force=True): if user_permissions: can_read_docs = [] for doctype, obj in user_permissions.items(): - for n in obj.get("docs", []): - can_read_docs.append('{}|{}'.format(doctype, frappe.db.escape(n))) + for n in obj: + can_read_docs.append('{}|{}'.format(doctype, frappe.db.escape(n.get('doc', '')))) if can_read_docs: conditions.append("concat_ws('|', `tabCommunication`.reference_doctype, `tabCommunication`.reference_name) in ({})".format( diff --git a/frappe/desk/query_report.py b/frappe/desk/query_report.py index 6d43ae5eb7..a68f1677de 100644 --- a/frappe/desk/query_report.py +++ b/frappe/desk/query_report.py @@ -57,7 +57,7 @@ def generate_report_result(report, filters=None, user=None): module = report.module or frappe.db.get_value("DocType", report.ref_doctype, "module") if report.is_standard == "Yes": method_name = get_report_module_dotted_path(module, report.name) + ".execute" - threshold = 10 + threshold = 60 res = [] start_time = datetime.datetime.now() diff --git a/frappe/public/js/frappe/form/footer/assign_to.js b/frappe/public/js/frappe/form/footer/assign_to.js index b7056fd745..95ddebcc99 100644 --- a/frappe/public/js/frappe/form/footer/assign_to.js +++ b/frappe/public/js/frappe/form/footer/assign_to.js @@ -103,6 +103,7 @@ frappe.ui.form.AssignTo = Class.extend({ } me.assign_to.dialog.show(); + me.assign_to = null; }, remove: function(owner) { var me = this; diff --git a/frappe/public/js/frappe/form/footer/timeline_item.html b/frappe/public/js/frappe/form/footer/timeline_item.html index 92f039b4e4..0815481030 100755 --- a/frappe/public/js/frappe/form/footer/timeline_item.html +++ b/frappe/public/js/frappe/form/footer/timeline_item.html @@ -2,7 +2,7 @@ {% if (data.user_content) { %}