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

refactor: made style changes & fixed query conversions

Browse source
This commit is contained in:
Aradhya-Tripathi 2021-10-22 01:15:46 +05:30
parent 0cce6e2af8
commit 012edfe090
2 changed files with 17 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
frappe/sessions.py
View file

@ -16,8 +16,8 @@ import frappe.translate
import redis
from urllib.parse import unquote
from frappe.cache_manager import clear_user_cache
from frappe.query_builder import Order
from frappe.query_builder import DocType
from frappe.query_builder import Order, DocType
@frappe.whitelist(allow_guest=True)
def clear(user=None):
@ -63,12 +63,12 @@ def get_sessions_to_clear(user=None, keep_current=False, device=None):
simultaneous_sessions = frappe.db.get_value('User', user, 'simultaneous_sessions') or 1
offset = simultaneous_sessions - 1
table = frappe.qb.DocType("Sessions")
criterion = frappe.qb.from_(table).where((table.user == user) & (table.device.isin(device)))
session = DocType("Sessions")
session_id = frappe.qb.from_(session).where((session.user == user) & (session.device.isin(device)))
if keep_current:
criterion = criterion.where(table.sid != frappe.db.escape(frappe.session.sid))
session_id = session_id.where(session.sid != frappe.db.escape(frappe.session.sid))
query = criterion.select(table.sid).offset(offset).limit(100).orderby(table.lastupdate, order=Order.desc)
query = session_id.select(session.sid).offset(offset).limit(100).orderby(session.lastupdate, order=Order.desc)
return frappe.db.sql_list(query)

32
frappe/translate.py
View file

@ -121,7 +121,7 @@ def set_default_language(lang):
def get_lang_dict():
"""Returns all languages in dict format, full name is the key e.g. `{"english":"en"}`"""
result = frappe.get_all("Language", fields=["language_name", "name"], order_by="modified", as_list=True)
result = dict(frappe.get_all("Language", fields=["language_name", "name"], order_by="modified", as_list=True))
return result
def get_dict(fortype, name=None):
@ -156,33 +156,23 @@ def get_dict(fortype, name=None):
messages += get_messages_from_include_files()
messages += (
frappe.qb.from_("Print Format")
.select(PseudoColumn("'Print Format:'"), "name")
.run()
)
.select(PseudoColumn("'Print Format:'"), "name")).run()
messages += (
frappe.qb.from_("DocType")
.select(PseudoColumn("'DocType:'"), "name")
.run()
)
.select(PseudoColumn("'DocType:'"), "name")).run()
messages += (
frappe.qb.from_("Role").select(PseudoColumn("'Role:'"), "name").run()
)
messages += (
frappe.qb.from_("Module Def")
.select(PseudoColumn("'Module:'"), "name")
.run()
)
.select(PseudoColumn("'Module:'"), "name")).run()
messages += (
frappe.qb.from_("Workspace Shortcut")
.where(Field("format").isnotnull())
.select(PseudoColumn("''"), "format")
.run()
)
.select(PseudoColumn("''"), "format")).run()
messages += (
frappe.qb.from_("Onboarding Step")
.select(PseudoColumn("''"), "title")
.run()
)
.select(PseudoColumn("''"), "title")).run()
messages = deduplicate_messages(messages)
message_dict = make_dict_from_messages(messages, load_user_translation=False)
@ -349,17 +339,17 @@ def get_messages_for_app(app, deduplicate=True):
# doctypes
if modules:
names = frappe.qb.from_("DocType").where(
filtered_doctypes = frappe.qb.from_("DocType").where(
Field("module").isin(modules)
).select("name").run()
for name in names:
for name in filtered_doctypes:
messages.extend(get_messages_from_doctype(name))
# pages
result = frappe.qb.from_("Page").where(
filtered_pages = frappe.qb.from_("Page").where(
Field("module").isin(modules)
).select("name", "title").run()
for name, title in result:
for name, title in filtered_pages:
messages.append((None, title or name))
messages.extend(get_messages_from_page(name))
@ -928,7 +918,7 @@ 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.get_all("Language", pluck="name", order_by="modified")
return frappe.get_all("Language", pluck="name")
def get_all_language_with_name():
return frappe.db.get_all('Language', ['language_code', 'language_name'])