Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: 修复提单节点存在 json 组件异常的问题 --bug=133449073 #1447

Merged
merged 1 commit into from
Nov 6, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions docs/RELEASE.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
# Changelog
## [Version: 2.7.1] - 2024-10-15
## [Version: 2.7.1] - 2024-11-06
【新增】pipeline管理工具集成
【优化】多行文本兼容 JSON、Markdown 格式
【修复】修复可输入单选组件在触发器无法选择条件的问题
【修复】修复节点新增字段无法检测上一节点的字段值的问题
【修复】修复可输入单选组件在触发器无法选择条件的问题
【修复】修复节点新增字段无法检测上一个节点的字段值的问题
【修复】修复提单节点存在 json 组件异常的问题


## [Version: 2.7.0] - 2024-10-10
Expand Down
7 changes: 4 additions & 3 deletions docs/RELEASE_EN.md
Original file line number Diff line number Diff line change
@@ -1,16 +1,17 @@
# Changelog
## [Version: 2.7.1] - 2024-10-15
## [Version: 2.7.1] - 2024-11-06
【Feature】Integrated pipeline management tool.
【Improved】Ensure TEXT compatibility with JSON and Markdown formats.
【Improved】Ensure TEXT compatibility with JSON and Markdown formats.
【Fix】Resolve the issue where the inputselect component cannot select conditions in the trigger.
【Fix】Fix the issue where newly added fields in a node cannot detect from the previous node.
【Fix】Fix the issue with the JSON component anomaly in the submission node.


## [Version: 2.7.0] - 2024-10-10
【Feature】Notification recipient blacklist filtering.
【Improved】Migrated the authentication information to header when calling esb, support open-paas/esb >= 2.12.20
【Improved】Changed “My Tasks” to “My Completed” in the navigation bar.
【Improved】Adjust default items when adding an Approval Node in the process.
【Improved】Adjust default items when adding an Approval Node in the process.
【Improved】Adjusted platform management permissions to be instance-free authentication.
【Fixed】The navigation bar style has been standardized according to the design specifications.
【Fixed】Modified the implementation method for exporting common API files.
Expand Down
10 changes: 9 additions & 1 deletion itsm/ticket/models/ticket.py
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
import time
from datetime import datetime
from itertools import chain
from json import JSONDecodeError

import requests
import jsonfield
Expand Down Expand Up @@ -3086,7 +3087,14 @@ def fill_state_fields(self, fields):
for ticket_field in filter_field_query_set:
ticket_field.value = fields_map[ticket_field.key]["value"]
if isinstance(ticket_field.value, str) and ticket_field.type not in FIELD_IGNORE_ESCAPE:
ticket_field.value = texteditor_escape(ticket_field.value)
need_escape = True
try:
json.loads(ticket_field.value)
need_escape = False
except JSONDecodeError:
pass
if need_escape:
ticket_field.value = texteditor_escape(ticket_field.value)

ticket_field.choice = fields_map[ticket_field.key].get("choice", [])
language_config = (
Expand Down
Loading