From e1013a976d3be2b06e74ac46be17d8722cf49707 Mon Sep 17 00:00:00 2001 From: Pratik Vyas Date: Thu, 3 Apr 2014 22:25:53 +0530 Subject: [PATCH 1/3] fix saving of global --- frappe/widgets/form/save.py | 5 +++-- frappe/widgets/moduleview.py | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/frappe/widgets/form/save.py b/frappe/widgets/form/save.py index cc7ce9373c..7d7eba846d 100644 --- a/frappe/widgets/form/save.py +++ b/frappe/widgets/form/save.py @@ -45,6 +45,7 @@ def send_updated_docs(doc): get_docinfo(doc.doctype, doc.name) d = doc.as_dict() - d["localname"] = doc.localname + if hasattr(doc, 'localname'): + d["localname"] = doc.localname - frappe.response.docs.append(d) \ No newline at end of file + frappe.response.docs.append(d) diff --git a/frappe/widgets/moduleview.py b/frappe/widgets/moduleview.py index 41da851126..572f08163a 100644 --- a/frappe/widgets/moduleview.py +++ b/frappe/widgets/moduleview.py @@ -173,4 +173,4 @@ def get_report_list(module, is_standard="No"): and docstatus in (0, NULL) and ifnull(is_standard, "No")=%s and ifnull(disabled,0) != 1 - order by name""", (module, is_standard), as_dict=True) \ No newline at end of file + order by name""", (module, is_standard), as_dict=True) From 3196a7f345b290c664e8fbd8c821aeccb531bf0b Mon Sep 17 00:00:00 2001 From: Pratik Vyas Date: Fri, 4 Apr 2014 00:19:05 +0530 Subject: [PATCH 2/3] add get_db_value to Document --- frappe/model/base_document.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/frappe/model/base_document.py b/frappe/model/base_document.py index bf367f9343..f5baee9433 100644 --- a/frappe/model/base_document.py +++ b/frappe/model/base_document.py @@ -44,6 +44,9 @@ class BaseDocument(object): if self.get(key) is None: self.set(key, value) + def get_db_value(self, key): + return frappe.db.get_value(self.doctype, self.name, key) + def get(self, key=None, filters=None, limit=None, default=None): if key: if isinstance(key, dict): From 17157a4eb9d4aa934da89892f4f42f851902b44c Mon Sep 17 00:00:00 2001 From: Pratik Vyas Date: Fri, 4 Apr 2014 00:20:49 +0530 Subject: [PATCH 3/3] fix missing return in celery SiteRouter :rage1: --- frappe/celery_app.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frappe/celery_app.py b/frappe/celery_app.py index 7032ad0dd8..7d03034d54 100644 --- a/frappe/celery_app.py +++ b/frappe/celery_app.py @@ -51,9 +51,9 @@ class SiteRouter(object): def route_for_task(self, task, args=None, kwargs=None): if hasattr(frappe.local, 'site'): if kwargs and kwargs.get("event", "").endswith("_long"): - get_queue(frappe.local.site, LONGJOBS_PREFIX) + return get_queue(frappe.local.site, LONGJOBS_PREFIX) else: - get_queue(frappe.local.site) + return get_queue(frappe.local.site) return None