AI/dify
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/langgenius/dify.git synced 2025-08-11 21:09:05 +08:00
Code Issues Packages Projects Releases Wiki Activity

Bugfix/invitemailmultilangs (#2257)

Browse Source 
Co-authored-by: crazywoola <427733928@qq.com>
This commit is contained in:
Benjamin 2024-01-28 19:56:09 +08:00 committed by GitHub
parent 5a6cb69951
commit 7076d41b29
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
api/controllers/console/workspace/members.py
View File

@ -56,6 +56,7 @@ class MemberInviteEmailApi(Resource):
invitee_emails = args['emails'] invitee_emails = args['emails']
invitee_role = args['role'] invitee_role = args['role']
interface_language = args['language']
if invitee_role not in ['admin', 'normal']: if invitee_role not in ['admin', 'normal']:
return {'code': 'invalid-role', 'message': 'Invalid role'}, 400 return {'code': 'invalid-role', 'message': 'Invalid role'}, 400
@ -64,8 +65,7 @@ class MemberInviteEmailApi(Resource):
console_web_url = current_app.config.get("CONSOLE_WEB_URL") console_web_url = current_app.config.get("CONSOLE_WEB_URL")
for invitee_email in invitee_emails: for invitee_email in invitee_emails:
try: try:
token = RegisterService.invite_new_member(inviter.current_tenant, invitee_email, role=invitee_role, token = RegisterService.invite_new_member(inviter.current_tenant, invitee_email, interface_language, role=invitee_role, inviter=inviter)
inviter=inviter)
invitation_results.append({ invitation_results.append({
'status': 'success', 'status': 'success',
'email': invitee_email, 'email': invitee_email,

12
api/services/account_service.py
View File

@ -138,8 +138,9 @@ class AccountService:
return account return account
@staticmethod @staticmethod
def create_account(email: str, name: str, password: str = None, def create_account(email: str, name: str, interface_language: str,
interface_language: str = languages[0], interface_theme: str = 'light', password: str = None,
interface_theme: str = 'light',
timezone: str = 'America/New_York', ) -> Account: timezone: str = 'America/New_York', ) -> Account:
"""create account""" """create account"""
account = Account() account = Account()
@ -429,7 +430,7 @@ class RegisterService:
db.session.begin_nested() db.session.begin_nested()
"""Register account""" """Register account"""
try: try:
account = AccountService.create_account(email, name, password) account = AccountService.create_account(email, name, interface_language=languages[0], password=password)
account.status = AccountStatus.ACTIVE.value account.status = AccountStatus.ACTIVE.value
account.initialized_at = datetime.utcnow() account.initialized_at = datetime.utcnow()
@ -452,15 +453,14 @@ class RegisterService:
return account return account
@classmethod @classmethod
def invite_new_member(cls, tenant: Tenant, email: str, role: str = 'normal', def invite_new_member(cls, tenant: Tenant, email: str, language: str, role: str = 'normal', inviter: Account = None) -> str:
inviter: Account = None) -> str:
"""Invite new member""" """Invite new member"""
account = Account.query.filter_by(email=email).first() account = Account.query.filter_by(email=email).first()
if not account: if not account:
TenantService.check_member_permission(tenant, inviter, None, 'add') TenantService.check_member_permission(tenant, inviter, None, 'add')
name = email.split('@')[0] name = email.split('@')[0]
account = AccountService.create_account(email, name) account = AccountService.create_account(email, name, interface_language=language)
account.status = AccountStatus.PENDING.value account.status = AccountStatus.PENDING.value
db.session.commit() db.session.commit()

9
web/app/components/header/account-setting/members-page/invite-modal/index.tsx
View File

@ -14,6 +14,8 @@ import { inviteMember } from '@/service/common'
import { emailRegex } from '@/config' import { emailRegex } from '@/config'
import { ToastContext } from '@/app/components/base/toast' import { ToastContext } from '@/app/components/base/toast'
import type { InvitationResult } from '@/models/common' import type { InvitationResult } from '@/models/common'
import I18n from '@/context/i18n'
import { getModelRuntimeSupported } from '@/utils/language'
import 'react-multi-email/dist/style.css' import 'react-multi-email/dist/style.css'
type IInviteModalProps = { type IInviteModalProps = {
@ -29,6 +31,9 @@ const InviteModal = ({
const [emails, setEmails] = useState<string[]>([]) const [emails, setEmails] = useState<string[]>([])
const { notify } = useContext(ToastContext) const { notify } = useContext(ToastContext)
const { locale } = useContext(I18n)
const language = getModelRuntimeSupported(locale)
const InvitingRoles = useMemo(() => [ const InvitingRoles = useMemo(() => [
{ {
name: 'normal', name: 'normal',
@ -42,11 +47,11 @@ const InviteModal = ({
const [role, setRole] = useState(InvitingRoles[0]) const [role, setRole] = useState(InvitingRoles[0])
const handleSend = useCallback(async () => { const handleSend = useCallback(async () => {
if (emails.map(email => emailRegex.test(email)).every(Boolean)) { if (emails.map((email: string) => emailRegex.test(email)).every(Boolean)) {
try { try {
const { result, invitation_results } = await inviteMember({ const { result, invitation_results } = await inviteMember({
url: '/workspaces/current/members/invite-email', url: '/workspaces/current/members/invite-email',
body: { emails, role: role.name }, body: { emails, role: role.name, language },
}) })
if (result === 'success') { if (result === 'success') {