Skip to content

Commit

Permalink
Merge pull request TencentBlueKing#1366 from benero/bugfix_api_retry
Browse files Browse the repository at this point in the history
bugfix: 修复 API 节点手动重试取值异常的问题
  • Loading branch information
benero authored Jul 18, 2024
2 parents 1152eae + 9a83518 commit afe2ff9
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 3 deletions.
3 changes: 2 additions & 1 deletion docs/RELEASE.md
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
# Changelog
## [Version: 2.6.24] - 2024-07-12
## [Version: 2.6.24] - 2024-07-18
【优化】通知模板列表搜索优化
【修复】新建服务校验失败信息收敛
【修复】引用公共触发器弹窗增加非空校验
【修复】服务列表搜索去掉sla筛选项
【修复】编辑数据字典侧滑面板挂载到body
【修复】修复全局配置favicon不生效的问题
【修复】修复获取 role 信息时, desc 为空导致的异常问题
【修复】修复 API 节点手动重试取值异常的问题

## [Version: 2.6.23] - 2024-07-03
【优化】服务表单左侧字段控件搜索支持清空操作
Expand Down
4 changes: 3 additions & 1 deletion docs/RELEASE_EN.md
Original file line number Diff line number Diff line change
@@ -1,12 +1,14 @@
# Changelog
## [Version: 2.6.24] - 2024-07-12
## [Version: 2.6.24] - 2024-07-18
【Improved】Optimized the search functionality for the notification template list.
【Fixed】Consolidated validation failure messages when creating a new service.
【Fixed】Added non-empty validation to the pop-up for referencing common triggers.
【Fixed】Removed the SLA filter option from the service list search.
【Fixed】Mounted the data dictionary edit side panel to the body.
【Fixed】Fixed the issue where the global configuration favicon was not being applied.
【Fixed】Resolved the issue causing an exception when desc is empty while fetching role information.
【Fixed】Fix the issue with the abnormal value retrieval during manual retry of the API node.


## [Version: 2.6.23] - 2024-07-03
【Improved】Enabled support for clearing the search operation on the left-side field controls of the service form.
Expand Down
3 changes: 2 additions & 1 deletion itsm/pipeline_plugins/components/collections/itsm_auto.py
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
import re
from datetime import datetime, timedelta

import jmespath
import jsonschema
from django.core.cache import cache
from django.db import transaction
Expand Down Expand Up @@ -93,7 +94,7 @@ def update_variables(self, rsp, ticket_id, variables, data=None):
for variable in variables:
TicketGlobalVariable.objects.filter(
ticket_id=ticket_id, key=variable["key"]
).update(value=rsp.get(variable["ref_path"], ""))
).update(value=jmespath.search(variable["ref_path"], rsp) or "")
return variables

@staticmethod
Expand Down

0 comments on commit afe2ff9

Please sign in to comment.