|
|
@@ -8,13 +8,15 @@ def custom_send_welcome_mail_to_user(doc, method=None):
|
|
|
# 判断下用户是不是新用户，已激活等等
|
|
|
if not doc.enabled:
|
|
|
return
|
|
|
+ # 确保reset_password_key已生成
|
|
|
+ if not doc.reset_password_key:
|
|
|
+ doc.reset_password_key = frappe.generate_hash(length=32)
|
|
|
+ doc.save(ignore_permissions=True)
|
|
|
|
|
|
template = "new_user"
|
|
|
full_name = doc.full_name or doc.first_name
|
|
|
- link = frappe.utils.get_url(
|
|
|
- "update-password?key={}".format(doc.reset_password_key)
|
|
|
- )
|
|
|
- login_url = frappe.utils.get_url("#login")
|
|
|
+ link = f"{frappe.conf.site_url}update-password?key={doc.reset_password_key}"
|
|
|
+ login_url = f"{frappe.conf.site_url}#login"
|
|
|
frappe.sendmail(
|
|
|
recipients=[doc.email],
|
|
|
subject="欢迎加入我们！",
|
