浏览代码

Fix: ensure InstalledApp deletion uses model instances instead of Row (#24942)

Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
tags/1.8.1
Yongtao Huang 2 个月前
父节点
当前提交
067b0d07c4
没有帐户链接到提交者的电子邮件
共有 2 个文件被更改,包括 12 次插入8 次删除
  1. 11
    7
      api/controllers/console/admin.py
  2. 1
    1
      web/app/components/tools/setting/build-in/config-credentials.tsx

+ 11
- 7
api/controllers/console/admin.py 查看文件

@@ -130,15 +130,19 @@ class InsertExploreAppApi(Resource):
app.is_public = False

with Session(db.engine) as session:
installed_apps = session.execute(
select(InstalledApp).where(
InstalledApp.app_id == recommended_app.app_id,
InstalledApp.tenant_id != InstalledApp.app_owner_tenant_id,
installed_apps = (
session.execute(
select(InstalledApp).where(
InstalledApp.app_id == recommended_app.app_id,
InstalledApp.tenant_id != InstalledApp.app_owner_tenant_id,
)
)
).all()
.scalars()
.all()
)

for installed_app in installed_apps:
db.session.delete(installed_app)
for installed_app in installed_apps:
session.delete(installed_app)

db.session.delete(recommended_app)
db.session.commit()

+ 1
- 1
web/app/components/tools/setting/build-in/config-credentials.tsx 查看文件

@@ -111,7 +111,7 @@ const ConfigCredential: FC<Props> = ({
<Button onClick={onRemove}>{t('common.operation.remove')}</Button>
)
}
< div className='flex space-x-2'>
<div className='flex space-x-2'>
<Button onClick={onCancel}>{t('common.operation.cancel')}</Button>
<Button loading={isLoading || isSaving} disabled={isLoading || isSaving} variant='primary' onClick={handleSave}>{t('common.operation.save')}</Button>
</div>

正在加载...
取消
保存