vassili/seitime-frappe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4

Merge pull request #481 from pdvyas/model-cleanup-hotfix

Browse source 
model-cleanup-fixes and others
This commit is contained in:
Rushabh Mehta 2014-04-04 10:38:49 +05:30
commit ff769cb478
4 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
frappe/celery_app.py
View file

@ -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

3
frappe/model/base_document.py
View file

@ -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):

5
frappe/widgets/form/save.py
View file

@ -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)
frappe.response.docs.append(d)

2
frappe/widgets/moduleview.py
View file

@ -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)
order by name""", (module, is_standard), as_dict=True)