Browse Source

refactor: converted more queries

version-14
Aradhya 3 years ago
parent
commit
ed7b3f54a7
2 changed files with 9 additions and 4 deletions
  1. +8
    -3
      frappe/translate.py
  2. +1
    -1
      frappe/twofactor.py

+ 8
- 3
frappe/translate.py View File

@@ -480,9 +480,14 @@ def get_messages_from_workflow(doctype=None, app_name=None):
messages.extend([("Workflow: " + w['name'], state['message']) messages.extend([("Workflow: " + w['name'], state['message'])
for state in states if is_translatable(state['message'])]) for state in states if is_translatable(state['message'])])


actions = frappe.db.sql(
'select distinct action from `tabWorkflow Transition` where parent=%s',
(w['name'],), as_dict=True)
actions = frappe.db.get_values(
"Workflow Transition",
filters={"parent": w["name"]},
fieldname="action",
as_dict=True,
distinct=True,
no_order=True,
)


messages.extend([("Workflow: " + w['name'], action['action']) \ messages.extend([("Workflow: " + w['name'], action['action']) \
for action in actions if is_translatable(action['action'])]) for action in actions if is_translatable(action['action'])])


+ 1
- 1
frappe/twofactor.py View File

@@ -417,4 +417,4 @@ def reset_otp_secret(user):
enqueue(method=frappe.sendmail, queue='short', timeout=300, event=None, is_async=True, job_name=None, now=False, **email_args) enqueue(method=frappe.sendmail, queue='short', timeout=300, event=None, is_async=True, job_name=None, now=False, **email_args)
return frappe.msgprint(_("OTP Secret has been reset. Re-registration will be required on next login.")) return frappe.msgprint(_("OTP Secret has been reset. Re-registration will be required on next login."))
else: else:
return frappe.throw(_("OTP secret can only be reset by the Administrator."))
return frappe.throw(_("OTP secret can only be reset by the Administrator."))

Loading…
Cancel
Save