Merge pull request #225 from zhu327/develop

feat: related_policy add update tag
TencentBlueKing · Sep 29, 2021 · 1e0e12b · 1e0e12b
2 parents f8a3a04 + 7a4d328
commit 1e0e12b
Show file tree

Hide file tree

Showing 5 changed files with 49 additions and 1 deletion.
diff --git a/release.md b/release.md
@@ -1,3 +1,16 @@
+# V1.5.4
+
+### 功能优化
+* 自定义权限申请支持实例审批人
+* 跳转申请不合并用户的已有权限
+* 授权api返回策略的实例数量
+
+### 缺陷修复
+* 修复企业微信邮件中续期邮件链接显示问题
+* 我的权限用户组权限查看态提示删除bug 
+* 业务跳转权限中心申请权限，申请期限不能修改
+* 修复通用操作显示问题
+
 # V1.5.3
 
 ### 缺陷修复

diff --git a/saas/VERSION b/saas/VERSION
@@ -1 +1 @@
-1.5.3
+1.5.4
diff --git a/saas/backend/apps/policy/views.py b/saas/backend/apps/policy/views.py
@@ -234,6 +234,17 @@ def create(self, request, *args, **kwargs):
                 system_id, parse_obj_as(List[PolicyTagBean], add_policy_list.policies)
             )
             tag_add_policy_list.set_tag(PolicyTag.ADD.value)  # 对于新增的部分打tag, 方便前端处理
+
+            # 对已有策略中会增加部分实例的策略打update标签
+            for p in target_policy_list.policies:
+                add_policy = add_policy_list.get(p.action_id)
+                if (
+                    add_policy
+                    and not p.has_related_resource_types(add_policy.related_resource_types)
+                    and p.tag != PolicyTag.ADD.value
+                ):
+                    p.tag = PolicyTag.UPDATE.value
+
             target_policy_list.add(tag_add_policy_list)  # 合并
 
         target_policy_list.fill_empty_fields()

diff --git a/saas/resources/version_log/V1.5.4_2021-09-29.md b/saas/resources/version_log/V1.5.4_2021-09-29.md
@@ -0,0 +1,12 @@
+# V1.5.4 版本更新日志
+
+### 功能优化
+* 自定义权限申请支持实例审批人
+* 跳转申请不合并用户的已有权限
+* 授权api返回策略的实例数量
+
+### 缺陷修复
+* 修复企业微信邮件中续期邮件链接显示问题
+* 我的权限用户组权限查看态提示删除bug 
+* 业务跳转权限中心申请权限，申请期限不能修改
+* 修复通用操作显示问题
diff --git a/saas/resources/version_log/V1.5.4_2021-09-29_en.md b/saas/resources/version_log/V1.5.4_2021-09-29_en.md
@@ -0,0 +1,12 @@
+# V1.5.4 ChangeLog
+
+### Optimization Updates
+* Custom permission application supports instance approvers
+* The jump application does not merge the user's existing permissions
+* The number of instances of the authorization api return strategy
+
+### Bug Fixes
+* Fixed the display problem of the renewal email link in the corporate WeChat email
+* My permission user group permission check status prompt delete bug
+* The business jump permission center applies for permission, the application period cannot be modified
+* Fix the display problem of general operation