Skip to content

Commit 32e8fda

Browse files
karuturiJessica Wang
authored andcommitted
Fixed CLOUDSTACK-6980: UI for RegisterTemplate API does not expose requireshvm parameter
1 parent f1039b7 commit 32e8fda

4 files changed

Lines changed: 19 additions & 0 deletions

File tree

client/WEB-INF/classes/resources/messages.properties

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@ label.switch.type=Switch Type
5151
label.service.state=Service State
5252
label.egress.default.policy=Egress Default Policy
5353
label.routing=Routing
54+
label.hvm=HVM
5455
label.about=About
5556
label.app.name=CloudStack
5657
label.about.app=About CloudStack

ui/dictionary.jsp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,7 @@ dictionary = {
6464
'label.service.state': '<fmt:message key="label.service.state" />',
6565
'label.egress.default.policy': '<fmt:message key="label.egress.default.policy" />',
6666
'label.routing': '<fmt:message key="label.routing" />',
67+
'label.hvm': '<fmt:message key="label.hvm" />',
6768
'message.validate.invalid.characters': '<fmt:message key="message.validate.invalid.characters" />',
6869
'message.validate.fieldrequired': '<fmt:message key="message.validate.fieldrequired" />',
6970
'message.validate.fixfield': '<fmt:message key="message.validate.fixfield" />',

ui/scripts/docs.js

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1218,6 +1218,10 @@ cloudStack.docs = {
12181218
desc: 'Check this if the template is used for deploying router.',
12191219
externalLink: ''
12201220
},
1221+
helpRegisterTemplateHvm: {
1222+
desc: 'Check this if the template requires hvm.',
1223+
externalLink: ''
1224+
},
12211225
// Upload volume
12221226
helpUploadVolumeName: {
12231227
desc: 'A unique name for the volume. This will be visible to users, so choose something descriptive.',

ui/scripts/templates.js

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -458,6 +458,13 @@
458458
docID: 'helpRegisterTemplateRouting',
459459
isBoolean: true,
460460
isHidden: true
461+
},
462+
requireshvm: {
463+
label: 'label.hvm',
464+
docID: 'helpRegisterTemplateHvm',
465+
isBoolean: true,
466+
isHidden: false,
467+
isChecked: true
461468
}
462469
}
463470
},
@@ -482,6 +489,12 @@
482489
});
483490
}
484491

492+
if (args.$form.find('.form-item[rel=requireshvm]').css("display") != "none") {
493+
$.extend(data, {
494+
requireshvm: (args.data.requireshvm == "on")
495+
});
496+
}
497+
485498
if (args.$form.find('.form-item[rel=isFeatured]').css("display") != "none") {
486499
$.extend(data, {
487500
isfeatured: (args.data.isFeatured == "on")

0 commit comments

Comments
 (0)