浏览代码

fix: --name option for the create-tenant command does not take effect (#11993)

tags/0.15.0
eux 10 个月前
父节点
当前提交
49bc602fb2
没有帐户链接到提交者的电子邮件
共有 2 个文件被更改,包括 9 次插入3 次删除
  1. 7
    2
      api/commands.py
  2. 2
    1
      api/services/account_service.py

+ 7
- 2
api/commands.py 查看文件

@@ -561,8 +561,13 @@ def create_tenant(email: str, language: Optional[str] = None, name: Optional[str
new_password = secrets.token_urlsafe(16)

# register account
account = RegisterService.register(email=email, name=account_name, password=new_password, language=language)

account = RegisterService.register(
email=email,
name=account_name,
password=new_password,
language=language,
create_workspace_required=False,
)
TenantService.create_owner_tenant_if_not_exist(account, name)

click.echo(

+ 2
- 1
api/services/account_service.py 查看文件

@@ -797,6 +797,7 @@ class RegisterService:
language: Optional[str] = None,
status: Optional[AccountStatus] = None,
is_setup: Optional[bool] = False,
create_workspace_required: Optional[bool] = True,
) -> Account:
db.session.begin_nested()
"""Register account"""
@@ -814,7 +815,7 @@ class RegisterService:
if open_id is not None and provider is not None:
AccountService.link_account_integrate(provider, open_id, account)

if FeatureService.get_system_features().is_allow_create_workspace:
if FeatureService.get_system_features().is_allow_create_workspace and create_workspace_required:
tenant = TenantService.create_tenant(f"{account.name}'s Workspace")
TenantService.create_tenant_member(tenant, account, role="owner")
account.current_tenant = tenant

正在加载...
取消
保存