Skip to content

Commit 186a63b

Browse files
huangwentai-wendeliSecloud
authored andcommitted
fix(backend): 修复资源操作记录问题 #15497
1 parent 715f01f commit 186a63b

File tree

2 files changed

+6
-0
lines changed

2 files changed

+6
-0
lines changed

dbm-ui/backend/db_services/dbresource/handlers.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -655,7 +655,11 @@ def get_evnet_info(cls, bk_host_ids, remark, host_id_ip_map):
655655
after_value = (
656656
remark_info[label_key]["after_value"] if remark_info[label_key].get("after_value") else _("无")
657657
)
658+
if before_value == after_value:
659+
continue
658660
remark_list.append(f"{RESOURCE_UPDATE_REMARK[label_key]}: {before_value}{after_value}")
661+
if not remark_list:
662+
continue
659663
new_remark = ";".join(remark_list)
660664
remark_map[host_id] = new_remark
661665
hosts.append({"ip": host_id_ip_map[str(host_id)], "bk_host_id": host_id})

dbm-ui/backend/db_services/dbresource/views/resource.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -511,6 +511,8 @@ def append_labels(self, request):
511511
bk_biz_id = append_params.pop("bk_biz_id")
512512
host_id_ip_map = append_params.pop("host_id_ip_map")
513513
remark_map, hosts = ResourceHandler.get_evnet_info(append_params["bk_host_ids"], remark, host_id_ip_map)
514+
if not remark_map:
515+
return Response(DBResourceApi.resource_append_labels(append_params))
514516
MachineEvent.create_machine_events(
515517
bk_biz_id, hosts, "resource_owner", None, request.user.username, None, "", remark_map
516518
)

0 commit comments

Comments
 (0)