From 3ceb0ea4d70cf1b122fedb2908f1a46266e2893f Mon Sep 17 00:00:00 2001 From: Faris Ansari Date: Mon, 21 Oct 2019 13:15:55 +0530 Subject: [PATCH] fix: cleanup --- frappe/cache_manager.py | 2 +- frappe/desk/doctype/todo/todo.json | 6 +++--- frappe/desk/form/assign_to.py | 5 ++++- frappe/desk/notifications.py | 6 ++---- frappe/share.py | 9 +++++---- 5 files changed, 15 insertions(+), 13 deletions(-) diff --git a/frappe/cache_manager.py b/frappe/cache_manager.py index 9b435f3854..4d5a7571ee 100644 --- a/frappe/cache_manager.py +++ b/frappe/cache_manager.py @@ -11,7 +11,7 @@ from frappe.desk.notifications import (delete_notification_count_for, common_default_keys = ["__default", "__global"] global_cache_keys = ("app_hooks", "installed_apps", - "app_modules", "module_app", "notification_config", "system_settings", + "app_modules", "module_app", "system_settings", 'scheduler_events', 'time_zone', 'webhooks', 'active_domains', 'active_modules', 'assignment_rule') diff --git a/frappe/desk/doctype/todo/todo.json b/frappe/desk/doctype/todo/todo.json index e412416c10..508720a488 100644 --- a/frappe/desk/doctype/todo/todo.json +++ b/frappe/desk/doctype/todo/todo.json @@ -154,8 +154,8 @@ ], "icon": "fa fa-check", "idx": 2, - "modified": "2019-09-21 14:25:12.420279", - "modified_by": "frappetestuser2@gmail.com", + "modified": "2019-09-10 14:34:59.161750", + "modified_by": "Administrator", "module": "Desk", "name": "ToDo", "owner": "Administrator", @@ -190,4 +190,4 @@ "title_field": "description", "track_changes": 1, "track_seen": 1 -} \ No newline at end of file +} diff --git a/frappe/desk/form/assign_to.py b/frappe/desk/form/assign_to.py index 20c692615f..27263dd70b 100644 --- a/frappe/desk/form/assign_to.py +++ b/frappe/desk/form/assign_to.py @@ -168,7 +168,10 @@ def notify_assignment(assigned_by, owner, doc_type, doc_name, action='CLOSE', if action=='CLOSE': subject = _('Your assignment on {0} {1} has been removed').format(frappe.bold(doc_type), frappe.bold(title)) else: - subject = '''{0} assigned a new task {1} {2} to you'''.format(user_name, doc_type, title) + user_name = frappe.bold(user_name) + document_type = frappe.bold(doc_type) + title = frappe.bold(title) + subject = _('{0} assigned a new task {1} {2} to you').format(user_name, doc_type, title) notification_doc = { 'type': 'Assignment', diff --git a/frappe/desk/notifications.py b/frappe/desk/notifications.py index 3fbda1331b..059cadc3bc 100644 --- a/frappe/desk/notifications.py +++ b/frappe/desk/notifications.py @@ -173,8 +173,7 @@ def get_notification_info(): return out def get_notification_config(): - cache = frappe.cache() - def _get(cache): + def _get(): subscribed_documents = get_subscribed_documents() config = frappe._dict() hooks = frappe.get_hooks() @@ -195,10 +194,9 @@ def get_notification_config(): config[key].update(nc.get(key, {})) else: config[key].update(nc.get(key, {})) - cache.hset("notification_config", frappe.session.user, config) return config - return cache.hget("notification_config", frappe.session.user, _get(cache)) + return frappe.cache().hget("notification_config", frappe.session.user, _get()) def get_filters_for(doctype): '''get open filters for doctype''' diff --git a/frappe/share.py b/frappe/share.py index a6ec2bfe1e..c8471bfe2c 100644 --- a/frappe/share.py +++ b/frappe/share.py @@ -41,7 +41,7 @@ def add(doctype, name, user=None, read=1, write=0, share=0, everyone=0, flags=No }) doc.save(ignore_permissions=True) - notify_assignment(user, doctype, name, everyone, description=None) + notify_assignment(user, doctype, name, everyone) follow_document(doctype, name, user) @@ -146,7 +146,7 @@ def check_share_permission(doctype, name): if not frappe.has_permission(doctype, ptype="share", doc=name): frappe.throw(_("No permission to {0} {1} {2}".format("share", doctype, name)), frappe.PermissionError) -def notify_assignment(shared_by, doctype, doc_name, everyone, description=None): +def notify_assignment(shared_by, doctype, doc_name, everyone): if not (shared_by and doctype and doc_name) or everyone: return @@ -157,8 +157,9 @@ def notify_assignment(shared_by, doctype, doc_name, everyone, description=None): frappe.db.get_value(doctype, doc_name, title_field) reference_user = get_fullname(frappe.session.user) - notification_message = _('''{0} shared a document {1} {2} with you''')\ - .format(frappe.bold(reference_user), frappe.bold(doctype), frappe.bold(title)) + notification_message = _('{0} shared a document {1} {2} with you').format( + frappe.bold(reference_user), frappe.bold(doctype), frappe.bold(title)) + notification_doc = { 'type': 'Share', 'document_type': doctype,