etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Sort vapps config and eula 

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
This commit is contained in:
davidjumani 2020-08-24 11:23:39 +05:30 committed by Rohit Yadav
parent 72c298ae44
commit 4d2e091d06
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
ui/src/views/compute/DeployVM.vue
View File

@ -341,7 +341,7 @@
v-for="(property, propertyIndex) in props"
:key="propertyIndex"
:v-bind="property.key" >
<span slot="label">
<span slot="label" style="text-transform: capitalize">
{{ property.label }}
<a-tooltip :title="property.description">
<a-icon type="info-circle" style="color: rgba(0,0,0,.45)" />
@ -485,7 +485,7 @@
v-for="(license, licenseIndex) in templateLicenses"
:key="licenseIndex"
:v-bind="license.id">
<span slot="label">
<span slot="label" style="text-transform: capitalize">
{{ 'Agreement ' + (licenseIndex+1) + ': ' + license.name }}
</span>
<a-textarea
@ -1677,8 +1677,11 @@ export default {
configurations.push(configuration)
}
configurations.sort(function (a, b) {
return a.cpunumber - b.cpunumber
return a.index - b.index
})
// configurations.forEach(x => {
// console.log(x.index)
// })
}
return configurations
},
@ -1686,11 +1689,12 @@ export default {
var licenses = []
if (template && template.details && Object.keys(template.details).length > 0) {
var keys = Object.keys(template.details)
keys = keys.filter(key => key.startsWith('ACS-eula-'))
const prefix = /ACS-eula-\d-/
keys = keys.filter(key => key.startsWith('ACS-eula-')).sort()
for (var key of keys) {
var license = {
id: this.escapePropertyKey(key.replace(' ', '-')),
name: key.replace('ACS-eula-', ''),
name: key.replace(prefix, ''),
text: template.details[key]
}
licenses.push(license)