Skip to content

europa 테스트 중 기능 오류수정(로컬템플릿업로드, 누락된 다국어 추가) #724

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.

Sign up for GitHub

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

Open
wants to merge 5 commits into
base: ablestack-europa
Choose a base branch
from
Open

europa 테스트 중 기능 오류수정(로컬템플릿업로드, 누락된 다국어 추가) #724

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
0c61c5c
europa버전 누락된 다국어부분 추가
sjyu1 Nov 26, 2025
fb13a77
중복되는 항목 삭제
sjyu1 Nov 26, 2025
a3a45cb
로컬에서 템플릿 업로드에서 템플릿형식 미입력시 오류수정
sjyu1 Nov 28, 2025
be96ccb
Update ko_KR.json
sjyu1 Nov 28, 2025
44c8412
Update ko_KR.json
sjyu1 Nov 28, 2025
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
2 changes: 1 addition & 1 deletion server/src/main/java/com/cloud/template/TemplateManagerImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2518,7 +2518,7 @@ public TemplateType validateTemplateType(BaseCmd cmd, boolean isAdmin, boolean i
} else if ((cmd instanceof RegisterVnfTemplateCmd || cmd instanceof UpdateVnfTemplateCmd) && !TemplateType.VNF.equals(templateType)) {
throw new InvalidParameterValueException("The template type must be VNF for VNF templates, but the actual type is " + templateType);
}
} else if (cmd instanceof RegisterTemplateCmd) {
} else if ((cmd instanceof RegisterTemplateCmd) || (cmd instanceof GetUploadParamsForTemplateCmd)) {
boolean isRouting = Boolean.TRUE.equals(isRoutingType);
templateType = (cmd instanceof RegisterVnfTemplateCmd) ? TemplateType.VNF : (isRouting ? TemplateType.ROUTING : TemplateType.USER);
}
Expand Down
5 changes: 0 additions & 5 deletions ui/public/locales/en.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2298,7 +2298,6 @@
"label.service.connectivity.distributedroutercapabilitycheckbox": "Distributed router",
"label.service.connectivity.regionlevelvpccapabilitycheckbox": "Region level VPC",
"label.service.group": "Service Group",
"label.serviceip": "Management IP",
"label.service.lb.elasticlbcheckbox": "Elastic LB",
"label.service.lb.inlinemodedropdown": "Mode",
"label.service.lb.lbisolationdropdown": "LB isolation",
Expand Down Expand Up @@ -2712,7 +2711,6 @@
"label.usenewdiskoffering": "Replace Disk Offering?",
"label.user": "User",
"label.user.conflict": "Conflict",
"label.userdata": "Userdata",
"label.tpm": "TPM enabled",
"label.userdatal2": "User data",
"label.username": "Username",
Expand Down Expand Up @@ -4283,8 +4281,6 @@
"GB*Month": "GB * Month",
"IP*Month": "IP * Month",
"Policy*Month": "Policy * Month",
"label.mountopts":"Mount Options",

"label.desktop.service": "Desktop",
"title.desktop.cluster": "Clusters",
"title.desktop.controller": "Controller Templates",
Expand Down Expand Up @@ -5016,7 +5012,6 @@
"label.create.host.devices": "transfer host device",
"message.restart.vm.host.update.settings": "Applies only when the virtual machine is rebooted",
"message.success.update.vm": "Host device applied",
"label.select.vm": "Please select a virtual machine",
"label.listhostdevices": "Devices",
"message.warning.host.devices": "You must completely stop and start the virtual machine for this to take effect. (You must set enable.additional.vm.configuration to true in global settings.)",
"label.recent.events": "Recent Events",
Expand Down
Loading
Loading