From da2de64e032eb0bb6128872dee3ab7e765e5848a Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Wed, 2 Apr 2014 12:08:05 +0530 Subject: [PATCH] frappe/frappe#478 fixed todo and renamed hooks --- frappe/core/page/messages/messages.py | 25 +++++++++++--------- frappe/hooks.txt | 10 ++++---- frappe/model/document.py | 4 ++-- frappe/templates/generators/website_group.py | 2 +- frappe/widgets/form/assign_to.py | 11 +-------- 5 files changed, 23 insertions(+), 29 deletions(-) diff --git a/frappe/core/page/messages/messages.py b/frappe/core/page/messages/messages.py index 5e5a1b9f49..8669d63460 100644 --- a/frappe/core/page/messages/messages.py +++ b/frappe/core/page/messages/messages.py @@ -66,7 +66,7 @@ def post(arg=None): import json arg = json.loads(arg) - d = frappe.get_doc('Comment') + d = frappe.new_doc('Comment') d.parenttype = arg.get("parenttype") d.comment = arg['txt'] d.comment_docname = arg['contact'] @@ -87,13 +87,16 @@ def delete(arg=None): def notify(arg=None): from frappe.utils import cstr, get_fullname, get_url - frappe.sendmail(\ - recipients=[frappe.db.get_value("User", arg["contact"], "email") or arg["contact"]], - sender= frappe.db.get_value("User", frappe.session.user, "email"), - subject="New Message from " + get_fullname(frappe.user.name), - message=frappe.get_template("templates/emails/new_message.html").render({ - "from": get_fullname(frappe.user.name), - "message": arg['txt'], - "link": get_url() - }) - ) \ No newline at end of file + try: + frappe.sendmail(\ + recipients=[frappe.db.get_value("User", arg["contact"], "email") or arg["contact"]], + sender= frappe.db.get_value("User", frappe.session.user, "email"), + subject="New Message from " + get_fullname(frappe.user.name), + message=frappe.get_template("templates/emails/new_message.html").render({ + "from": get_fullname(frappe.user.name), + "message": arg['txt'], + "link": get_url() + }) + ) + except frappe.OutgoingEmailError, e: + pass \ No newline at end of file diff --git a/frappe/hooks.txt b/frappe/hooks.txt index 45cc4912da..c3aff8d520 100644 --- a/frappe/hooks.txt +++ b/frappe/hooks.txt @@ -42,9 +42,9 @@ has_permission:ToDo = frappe.core.doctype.todo.todo.has_permission # bean -bean_event:User Vote:after_insert = frappe.templates.generators.website_group.clear_cache_on_bean_event -bean_event:Website Route Permission:on_update = frappe.templates.generators.website_group.clear_cache_on_bean_event +doc_event:User Vote:after_insert = frappe.templates.generators.website_group.clear_cache_on_doc_event +doc_event:Website Route Permission:on_update = frappe.templates.generators.website_group.clear_cache_on_doc_event -bean_event:*:on_update = frappe.core.doctype.notification_count.notification_count.clear_doctype_notifications -bean_event:*:on_cancel = frappe.core.doctype.notification_count.notification_count.clear_doctype_notifications -bean_event:*:on_trash = frappe.core.doctype.notification_count.notification_count.clear_doctype_notifications +doc_event:*:on_update = frappe.core.doctype.notification_count.notification_count.clear_doctype_notifications +doc_event:*:on_cancel = frappe.core.doctype.notification_count.notification_count.clear_doctype_notifications +doc_event:*:on_trash = frappe.core.doctype.notification_count.notification_count.clear_doctype_notifications diff --git a/frappe/model/document.py b/frappe/model/document.py index c78b830d32..cfd6b9877d 100644 --- a/frappe/model/document.py +++ b/frappe/model/document.py @@ -396,8 +396,8 @@ class Document(BaseDocument): def composer(self, *args, **kwargs): hooks = [] method = f.__name__ - for handler in frappe.get_hooks("bean_event:" + self.doctype + ":" + method) \ - + frappe.get_hooks("bean_event:*:" + method): + for handler in frappe.get_hooks("doc_event:" + self.doctype + ":" + method) \ + + frappe.get_hooks("doc_event:*:" + method): hooks.append(frappe.getattr(handler)) composed = compose(f, *hooks) diff --git a/frappe/templates/generators/website_group.py b/frappe/templates/generators/website_group.py index b2e1f55a36..14bdc20fbe 100644 --- a/frappe/templates/generators/website_group.py +++ b/frappe/templates/generators/website_group.py @@ -138,7 +138,7 @@ def clear_event_cache(): for group in frappe.db.sql_list("""select name from `tabWebsite Group` where group_type='Event'"""): clear_unit_views(website_group=group) -def clear_cache_on_bean_event(bean, method, *args, **kwargs): +def clear_cache_on_doc_event(bean, method, *args, **kwargs): clear_cache(path=bean.website_route, website_group=bean.website_group) def get_pathname(group): diff --git a/frappe/widgets/form/assign_to.py b/frappe/widgets/form/assign_to.py index 99599d578c..3617649bc2 100644 --- a/frappe/widgets/form/assign_to.py +++ b/frappe/widgets/form/assign_to.py @@ -63,16 +63,7 @@ def add(args=None): # notify if not args.get("no_notification"): notify_assignment(d.assigned_by, d.owner, d.reference_type, d.reference_name, action='ASSIGN', description=args.get("description"), notify=args.get('notify')) - - # update feeed - try: - from erpnext.home import make_feed - from frappe.utils import get_fullname - make_feed('Assignment', d.reference_type, d.reference_name, frappe.session['user'], - '[%s] Assigned to %s' % (d.priority, get_fullname(d.owner)), '#C78F58') - except ImportError, e: - pass - + return get(args) @frappe.whitelist()