You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by nv...@apache.org on 2022/03/07 11:01:12 UTC
[cloudstack] branch 4.16 updated: UI: update vm with userdata (#6051)
This is an automated email from the ASF dual-hosted git repository.
nvazquez pushed a commit to branch 4.16
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
The following commit(s) were added to refs/heads/4.16 by this push:
new 84f19d8 UI: update vm with userdata (#6051)
84f19d8 is described below
commit 84f19d8f3641fbe5c4fe1adb66fb99a3fa6976dc
Author: Wei Zhou <we...@apache.org>
AuthorDate: Mon Mar 7 11:59:52 2022 +0100
UI: update vm with userdata (#6051)
* UI: update vm with userdata
* Update ui/src/views/compute/EditVM.vue
Co-authored-by: David Jumani <dj...@gmail.com>
* Update #6051: small fixes
Co-authored-by: David Jumani <dj...@gmail.com>
---
ui/src/views/compute/EditVM.vue | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/ui/src/views/compute/EditVM.vue b/ui/src/views/compute/EditVM.vue
index ee4273d..e3348bc 100644
--- a/ui/src/views/compute/EditVM.vue
+++ b/ui/src/views/compute/EditVM.vue
@@ -74,6 +74,12 @@
}"
:dataSource="groups.opts" />
</a-form-item>
+ <a-form-item>
+ <tooltip-label slot="label" :title="$t('label.userdata')" :tooltip="apiParams.userdata.description"/>
+ <a-textarea
+ v-decorator="['userdata']">
+ </a-textarea>
+ </a-form-item>
<div :span="24" class="action-button">
<a-button :loading="loading" @click="onCloseAction">{{ this.$t('label.cancel') }}</a-button>
@@ -145,7 +151,6 @@ export default {
},
fetchTemplateData () {
const params = {}
- console.log('templateid ' + this.resource.templateid)
params.id = this.resource.templateid
params.isrecursive = true
params.templatefilter = 'all'
@@ -198,6 +203,14 @@ export default {
this.$notifyError(error)
}).finally(() => { this.groups.loading = false })
},
+ sanitizeReverse (value) {
+ const reversedValue = value
+ .replace(/&/g, '&')
+ .replace(/</g, '<')
+ .replace(/>/g, '>')
+
+ return reversedValue
+ },
handleSubmit (e) {
e.preventDefault()
this.form.validateFieldsAndScroll((err, values) => {
@@ -214,10 +227,15 @@ export default {
if (values.haenable !== undefined) {
params.haenable = values.haenable
}
- params.group = values.group
+ if (values.group && values.group.length > 0) {
+ params.group = values.group
+ }
+ if (values.userdata && values.userdata.length > 0) {
+ params.userdata = encodeURIComponent(btoa(this.sanitizeReverse(values.userdata)))
+ }
this.loading = true
- api('updateVirtualMachine', params).then(json => {
+ api('updateVirtualMachine', {}, 'POST', params).then(json => {
this.$message.success({
content: `${this.$t('label.action.edit.instance')} - ${values.name}`,
duration: 2