Repository: cloudstack Updated Branches: refs/heads/master f1039b782 -> 32e8fda96
Fixed CLOUDSTACK-6980: UI for RegisterTemplate API does not expose requireshvm parameter Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/32e8fda9 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/32e8fda9 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/32e8fda9 Branch: refs/heads/master Commit: 32e8fda965252322eccda01e14f854051d665ed0 Parents: f1039b7 Author: Rajani Karuturi <rajanikarut...@gmail.com> Authored: Fri Jul 25 15:23:38 2014 +0530 Committer: Jessica Wang <jessicaw...@apache.org> Committed: Mon Jul 28 11:20:04 2014 -0700 ---------------------------------------------------------------------- client/WEB-INF/classes/resources/messages.properties | 1 + ui/dictionary.jsp | 1 + ui/scripts/docs.js | 4 ++++ ui/scripts/templates.js | 13 +++++++++++++ 4 files changed, 19 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/32e8fda9/client/WEB-INF/classes/resources/messages.properties ---------------------------------------------------------------------- diff --git a/client/WEB-INF/classes/resources/messages.properties b/client/WEB-INF/classes/resources/messages.properties index 271ffec..a0205e1 100644 --- a/client/WEB-INF/classes/resources/messages.properties +++ b/client/WEB-INF/classes/resources/messages.properties @@ -51,6 +51,7 @@ label.switch.type=Switch Type label.service.state=Service State label.egress.default.policy=Egress Default Policy label.routing=Routing +label.hvm=HVM label.about=About label.app.name=CloudStack label.about.app=About CloudStack http://git-wip-us.apache.org/repos/asf/cloudstack/blob/32e8fda9/ui/dictionary.jsp ---------------------------------------------------------------------- diff --git a/ui/dictionary.jsp b/ui/dictionary.jsp index beb082b..10aeaf9 100644 --- a/ui/dictionary.jsp +++ b/ui/dictionary.jsp @@ -64,6 +64,7 @@ dictionary = { 'label.service.state': '<fmt:message key="label.service.state" />', 'label.egress.default.policy': '<fmt:message key="label.egress.default.policy" />', 'label.routing': '<fmt:message key="label.routing" />', +'label.hvm': '<fmt:message key="label.hvm" />', 'message.validate.invalid.characters': '<fmt:message key="message.validate.invalid.characters" />', 'message.validate.fieldrequired': '<fmt:message key="message.validate.fieldrequired" />', 'message.validate.fixfield': '<fmt:message key="message.validate.fixfield" />', http://git-wip-us.apache.org/repos/asf/cloudstack/blob/32e8fda9/ui/scripts/docs.js ---------------------------------------------------------------------- diff --git a/ui/scripts/docs.js b/ui/scripts/docs.js index 2075e30..8ef9f24 100755 --- a/ui/scripts/docs.js +++ b/ui/scripts/docs.js @@ -1218,6 +1218,10 @@ cloudStack.docs = { desc: 'Check this if the template is used for deploying router.', externalLink: '' }, + helpRegisterTemplateHvm: { + desc: 'Check this if the template requires hvm.', + externalLink: '' + }, // Upload volume helpUploadVolumeName: { desc: 'A unique name for the volume. This will be visible to users, so choose something descriptive.', http://git-wip-us.apache.org/repos/asf/cloudstack/blob/32e8fda9/ui/scripts/templates.js ---------------------------------------------------------------------- diff --git a/ui/scripts/templates.js b/ui/scripts/templates.js index e12927c..3e048cc 100644 --- a/ui/scripts/templates.js +++ b/ui/scripts/templates.js @@ -458,6 +458,13 @@ docID: 'helpRegisterTemplateRouting', isBoolean: true, isHidden: true + }, + requireshvm: { + label: 'label.hvm', + docID: 'helpRegisterTemplateHvm', + isBoolean: true, + isHidden: false, + isChecked: true } } }, @@ -482,6 +489,12 @@ }); } + if (args.$form.find('.form-item[rel=requireshvm]').css("display") != "none") { + $.extend(data, { + requireshvm: (args.data.requireshvm == "on") + }); + } + if (args.$form.find('.form-item[rel=isFeatured]').css("display") != "none") { $.extend(data, { isfeatured: (args.data.isFeatured == "on")
