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

fix: fixed erroneous queries in translate

Browse source
This commit is contained in:
Aradhya-Tripathi 2021-10-16 09:21:38 +05:30
parent 2c088c81ba
commit 0cce6e2af8
3 changed files with 36 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
frappe/core/doctype/activity_log/activity_log.py
View file

@ -9,6 +9,7 @@ from frappe.core.utils import set_timeline_doc
import frappe
from frappe.query_builder import DocType, Interval
from frappe.query_builder.functions import Now
from pypika.terms import PseudoColumn
class ActivityLog(Document):
def before_insert(self):
@ -47,6 +48,6 @@ def clear_activity_logs(days=None):
if not days:
days = 90
doctype = DocType("Activity Log")
frappe.qb.from_(doctype).where(
doctype.creation < (Now() - Interval(days=days))
).delete().run()
frappe.db.delete(doctype, filters=(
doctype.creation < PseudoColumn(f"({Now() - Interval(days=days)})")
))

3
frappe/core/doctype/log_settings/log_settings.py
View file

@ -7,6 +7,7 @@ from frappe import _
from frappe.model.document import Document
from frappe.query_builder import DocType, Interval
from frappe.query_builder.functions import Now
from pypika.terms import PseudoColumn
class LogSettings(Document):
@ -18,7 +19,7 @@ class LogSettings(Document):
def clear_error_logs(self):
table = DocType("Error Log")
frappe.db.delete(table, filters=(
table.creation < Now() - Interval(days=self.clear_error_log_after)
table.creation < PseudoColumn(f"({Now() - Interval(days=self.clear_error_log_after)})")
))
def clear_activity_logs(self):

36
frappe/translate.py
View file

@ -21,6 +21,7 @@ import frappe
from frappe.model.utils import InvalidIncludePath, render_include
from frappe.utils import get_bench_path, is_html, strip, strip_html_tags
from frappe.query_builder import Field
from pypika.terms import PseudoColumn
def get_language(lang_list: List = None) -> str:
@ -153,12 +154,35 @@ def get_dict(fortype, name=None):
messages += get_messages_from_navbar()
messages += get_messages_from_include_files()
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(Field("format").isnotnull()).select("").run()
messages += frappe.qb.from_("Onboarding Step").select("", "title").run()
messages += (
frappe.qb.from_("Print Format")
.select(PseudoColumn("'Print Format:'"), "name")
.run()
)
messages += (
frappe.qb.from_("DocType")
.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()
)
messages += (
frappe.qb.from_("Workspace Shortcut")
.where(Field("format").isnotnull())
.select(PseudoColumn("''"), "format")
.run()
)
messages += (
frappe.qb.from_("Onboarding Step")
.select(PseudoColumn("''"), "title")
.run()
)
messages = deduplicate_messages(messages)
message_dict = make_dict_from_messages(messages, load_user_translation=False)