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

refactor: converted queries in share & translate

Browse source
This commit is contained in:
Aradhya-Tripathi 2021-10-13 15:13:13 +05:30
parent a621c4178c
commit e0a3e4efe3
2 changed files with 14 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
frappe/share.py
View file

@ -128,8 +128,10 @@ def get_shared_doctypes(user=None):
"""Return list of doctypes in which documents are shared for the given user."""
if not user:
user = frappe.session.user
return frappe.db.sql_list("select distinct share_doctype from tabDocShare where (user=%s or everyone=1)", user)
table = frappe.qb.DocType("DocShare")
query = frappe.qb.from_(table).where(table.user == user | table.everyone == 1) \
.select(table.share_doctype).distinct()
return frappe.db.sql_list(query)
def get_share_name(doctype, name, user, everyone):
if cint(everyone):

18
frappe/translate.py
View file

@ -119,7 +119,8 @@ def set_default_language(lang):
def get_lang_dict():
"""Returns all languages in dict format, full name is the key e.g. `{"english":"en"}`"""
return dict(frappe.db.sql('select language_name, name from tabLanguage'))
result = dict(frappe.qb.from_("Language").select("language_name", "name").run())
return result
def get_dict(fortype, name=None):
"""Returns translation dict for a type of object.
@ -151,12 +152,12 @@ def get_dict(fortype, name=None):
messages += get_messages_from_navbar()
messages += get_messages_from_include_files()
messages += frappe.db.sql("select 'Print Format:', name from `tabPrint Format`")
messages += frappe.db.sql("select 'DocType:', name from tabDocType")
messages += frappe.db.sql("select 'Role:', name from tabRole")
messages += frappe.db.sql("select 'Module:', name from `tabModule Def`")
messages += frappe.db.sql("select '', format from `tabWorkspace Shortcut` where format is not null")
messages += frappe.db.sql("select '', title from `tabOnboarding Step`")
messages += frappe.qb.from_("Print Format").select("Print Format:", "name").run()
messages += frappe.qb.from_("DocType").select("DocType:", "name").run()
messages += frappe.qb.from_("Role").select("Role:", "name").run()
messages += frappe.qb.from_("Module Def").select("Module:", "name").run()
messages += frappe.qb.from_("Workspace Shortcut").where(frappe.qb.Field("format" != None)).select("").run()
messages += frappe.qb.from_("Onboarding Step").select("", "title").run()
messages = deduplicate_messages(messages)
message_dict = make_dict_from_messages(messages, load_user_translation=False)
@ -898,7 +899,8 @@ def get_translator_url():
def get_all_languages(with_language_name=False):
"""Returns all language codes ar, ch etc"""
def get_language_codes():
return frappe.db.sql_list('select name from tabLanguage')
query = frappe.qb.from_("Language").select("name")
return frappe.db.sql_list(query)
def get_all_language_with_name():
return frappe.db.get_all('Language', ['language_code', 'language_name'])