Skip to content

EB-1588 expose enlightenment toggle #45

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

Merged
radu-todirica merged 1 commit into from
Jun 5, 2019
Merged

EB-1588 expose enlightenment toggle #45

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions client/WEB-INF/classes/resources/messages.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,7 @@ error.something.went.wrong.please.correct.the.following=Something went wrong; pl
error.unable.to.reach.management.server=Unable to reach Management Server
error.unresolved.internet.name=Your internet name cannot be resolved.
label.extractable=Extractable
label.enlightenment=Enlightenment
force.delete.domain.warning=Warning\: Choosing this option will cause the deletion of all child domains and all associated accounts and their resources.
force.delete=Force Delete
force.remove.host.warning=Warning\: Choosing this option will cause CloudStack to forcefully stop all running virtual machines before removing this host from the cluster.
Expand Down
1 change: 1 addition & 0 deletions ui/dictionary.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,7 @@ dictionary = {
'error.unable.to.reach.management.server': '<fmt:message key="error.unable.to.reach.management.server" />',
'error.unresolved.internet.name': '<fmt:message key="error.unresolved.internet.name" />',
'label.extractable': '<fmt:message key="label.extractable" />',
'label.enlightenment': '<fmt:message key="label.enlightenment"/>',
'force.delete.domain.warning': '<fmt:message key="force.delete.domain.warning" />',
'force.delete': '<fmt:message key="force.delete" />',
'force.remove': '<fmt:message key="force.remove" />',
Expand Down
28 changes: 28 additions & 0 deletions ui/scripts/templates.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -497,6 +497,28 @@
}
},

enlightenment: {
label: "label.enlightenment",
select: function(args) {
var items = []
items.push({
id: "none",
description: "none"
});
items.push({
id: "true",
description: "true"
});
items.push({
id: "false",
description: "false"
});
args.response.success({
data: items
});
}
},

isExtractable: {
label: "label.extractable",
docID: 'helpRegisterTemplateExtractable',
Expand Down Expand Up @@ -582,6 +604,12 @@
});
}

if(args.data.enlightenment != "none") {
$.extend(data, {
'details[0].enlightenment': args.data.enlightenment
});
}

//XenServer only (starts here)
if (args.$form.find('.form-item[rel=xenserverToolsVersion61plus]').css("display") != "none") {
$.extend(data, {
Expand Down