Merge pull request #482 from nannan00/fix_scope_update_error

fix(scope update): support id and action_id

release.md

@@ -1,3 +1,9 @@
+# V1.5.15
+
+### 缺陷修复
+* 修复LongTask改同步后, celery_id获取为None的问题
+* 修复分级管理员权限Scope数据结构不兼容action_id问题
+
 # V1.5.14
 
 ### 新增功能

saas/VERSION

@@ -1 +1 @@
-1.5.14
+1.5.15

saas/backend/long_task/tasks.py

@@ -203,7 +203,7 @@ def run(self, id: int):
 
         params = handler.get_params()
 
-        celery_id = self.request.id
+        celery_id = self.request.id or ""
         TaskDetail.objects.filter(pk=id).update(
             celery_id=celery_id,
             status=TaskStatus.RUNNING.value,  # type: ignore[attr-defined]

saas/backend/service/role.py

@@ -14,7 +14,7 @@
 
 from django.db import transaction
 from django.utils.translation import gettext as _
-from pydantic import BaseModel, parse_obj_as
+from pydantic import BaseModel, Field, parse_obj_as
 
 from backend.apps.role.models import (
     Role,
@@ -37,9 +37,12 @@
 
 
 class AuthScopeAction(BaseModel):
-    id: str
+    id: str = Field(alias="action_id")
     related_resource_types: List[RelatedResource]
 
+    class Config:
+        allow_population_by_field_name = True  # 支持alias字段同时传 action_id 与 id
+
 
 class AuthScopeSystem(BaseModel):
     system_id: str

saas/resources/version_log/V1.5.15_2021-12-06.md

@@ -0,0 +1,5 @@
+# V1.5.15 版本更新日志
+
+### 缺陷修复
+* 修复LongTask改同步后, celery_id获取为None的问题
+* 修复分级管理员权限Scope数据结构不兼容action_id问题

saas/resources/version_log/V1.5.15_2021-12-06_en.md

@@ -0,0 +1,5 @@
+# V1.5.15 ChangeLog
+
+### Bug Fixes
+* Fixed the issue that celery_id was obtained as None after LongTask changed synchronization
+* Fixed the issue of incompatible action_id with the Scope data structure of the hierarchical administrator authority