Skip to content

Commit 2002e03

Browse files
authored
fix: verify_name_is_unique not work well when bk_console app model ha… (#2775)
1 parent 06c393f commit 2002e03

1 file changed

Lines changed: 6 additions & 1 deletion

File tree

  • apiserver/paasng/paasng/accessories/publish/sync_market

apiserver/paasng/paasng/accessories/publish/sync_market/managers.py

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,12 +118,17 @@ def get(self, code: str):
118118
def verify_name_is_unique(
119119
self, name: str, code: Optional[str] = None, field_name: str = "name", app_tenant_id: Optional[str] = None
120120
) -> bool:
121+
# 兼容 model 没有 name_en 字段的情况: 如果没有,则不做校验,直接返回 True
122+
if field_name == "name_en" and not hasattr(self.model, "name_en"):
123+
return True
124+
121125
qs = self.session.query(self.model)
122126
if code:
123127
qs = qs.filter(self.model.code != code)
124128
if hasattr(self.model, "app_tenant_id"):
125129
qs = self._narrow_by_tenant(qs, app_tenant_id)
126-
if field_name == "name_en" and hasattr(self.model, "name_en"):
130+
131+
if field_name == "name_en":
127132
app = qs.filter_by(name_en=name).scalar()
128133
else:
129134
app = qs.filter_by(name=name).scalar()

0 commit comments

Comments
 (0)