Skip to content

NAS B&R Plugin enhancements #9666

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
Pearl1594 merged 27 commits into from
Mar 4, 2025
Merged

NAS B&R Plugin enhancements #9666

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
64db486
NAS B&R Plugin enhancements
Pearl1594 Sep 10, 2024
d5a259d
Prevent printing mount opts which may include password by removing fr…
Pearl1594 Sep 20, 2024
e2cb774
Merge branch 'main' of https://github.com/apache/cloudstack into nas-…
Pearl1594 Sep 20, 2024
6dfb0ea
revert marvin change
Pearl1594 Sep 20, 2024
b1ccf9d
add sanity checks to validate minimum qemu and libvirt versions
Pearl1594 Sep 23, 2024
343e7dc
check is user running script is part of libvirt group
Pearl1594 Sep 23, 2024
f2f81c8
revert changes of retore expunged VM
Pearl1594 Sep 23, 2024
be9eba3
add code coverage ignore file
Pearl1594 Sep 30, 2024
585126b
remove check
Pearl1594 Sep 30, 2024
d024a96
issue with listing schedules and add defensive checks
Pearl1594 Sep 30, 2024
5c23f4b
redirect logs to agent log file
Pearl1594 Oct 1, 2024
0760ef5
add some more debugging
Pearl1594 Oct 1, 2024
bf19dea
remove test file
Pearl1594 Oct 1, 2024
5430080
Merge branch 'main' of https://github.com/apache/cloudstack into nas-…
Pearl1594 Oct 1, 2024
5bfed06
prevent deletion of cks cluster when vms associated to a backup offering
Pearl1594 Oct 1, 2024
c087de4
Merge branch '4.19'
DaanHoogland Oct 2, 2024
3ae3601
delete all snapshot policies when bkp offering is disassociated from …
Pearl1594 Oct 4, 2024
d6181d5
Fix `updateTemplatePermission` when the UI is set to a language other…
lucas-a-martins Oct 4, 2024
59464be
Add nobrl in the mountopts for cifs file system
Pearl1594 Oct 8, 2024
862211c
Fix restoration of VM / volumes with cifs
Pearl1594 Oct 8, 2024
7caa908
add cifs utils for el8
Pearl1594 Oct 8, 2024
482c2c9
add cifs-utils for ubuntu cloudstack-agent
Pearl1594 Oct 8, 2024
75e5c0c
Merge branch 'main' of https://github.com/apache/cloudstack into nas-…
Pearl1594 Oct 8, 2024
f6f0ba6
syntax error
Pearl1594 Oct 9, 2024
9a6e0e3
Merge branch 'main' into nas-br-partb
DaanHoogland Oct 28, 2024
5e39348
Merge branch '4.20' of https://github.com/apache/cloudstack into nas-…
Pearl1594 Feb 11, 2025
9714aae
remove required constraint on both vmid and id params for the delete …
Pearl1594 Feb 27, 2025
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
Prev Previous commit
Next Next commit
Fix updateTemplatePermission when the UI is set to a language other… 
… than English (#9766)

* Fix updateTemplatePermission UI in non-english language

* Improve fix

---------

Co-authored-by: Lucas Martins <lucas.martins@scclouds.com.br>
  • Loading branch information
@lucas-a-martins
lucas-a-martins and Lucas Martins authored Oct 4, 2024
commit d6181d542108d02cca31daa758234bb29e1b317a
4 changes: 2 additions & 2 deletions ui/public/locales/pt_BR.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1482,8 +1482,8 @@
"label.setting": "Configura\u00e7\u00e3o",
"label.settings": "Configura\u00e7\u00f5es",
"label.setup": "Configura\u00e7\u00e3o",
"label.shared": "Compatilhado",
"label.sharedexecutable": "Compatilhado",
"label.shared": "Compartilhado",
"label.sharedexecutable": "Compartilhado",
"label.sharedmountpoint": "SharedMountPoint",
"label.sharedrouterip": "Endere\u00e7os IPv4 para o roteador dentro da rede compartilhada",
"label.sharedrouteripv6": "Endere\u00e7os IPv6 para o roteador dentro da rede compartilhada",
Expand Down
18 changes: 9 additions & 9 deletions ui/src/views/image/UpdateTemplateIsoPermissions.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,21 +25,21 @@
<p class="form__label">{{ $t('label.operation') }}</p>
<a-select
v-model:value="selectedOperation"
:defaultValue="$t('label.add')"
:defaultValue="'add'"
@change="fetchData"
v-focus="true"
showSearch
optionFilterProp="value"
:filterOption="(input, option) => {
return option.value.toLowerCase().indexOf(input.toLowerCase()) >= 0
}" >
<a-select-option :value="$t('label.add')">{{ $t('label.add') }}</a-select-option>
<a-select-option :value="$t('label.remove')">{{ $t('label.remove') }}</a-select-option>
<a-select-option :value="$t('label.reset')">{{ $t('label.reset') }}</a-select-option>
<a-select-option :value="'add'">{{ $t('label.add') }}</a-select-option>
<a-select-option :value="'remove'">{{ $t('label.remove') }}</a-select-option>
<a-select-option :value="'reset'">{{ $t('label.reset') }}</a-select-option>
</a-select>
</div>

<template v-if="selectedOperation !== $t('label.reset')">
<template v-if="selectedOperation !== 'reset'">
<div class="form__item">
<p class="form__label">
<span class="required">*</span>
Expand Down Expand Up @@ -150,7 +150,7 @@ export default {
selectedAccounts: [],
selectedProjects: [],
selectedAccountsList: '',
selectedOperation: this.$t('label.add'),
selectedOperation: 'add',
selectedShareWith: this.$t('label.account'),
accountError: false,
projectError: false,
Expand All @@ -163,15 +163,15 @@ export default {
accountsList () {
return this.accounts.length > 0 ? this.accounts
.filter(a =>
this.selectedOperation === this.$t('label.add')
this.selectedOperation === 'add'
? !this.permittedAccounts.includes(a.name)
: this.permittedAccounts.includes(a.name)
) : this.accounts
},
projectsList () {
return this.projects > 0 ? this.projects
.filter(p =>
this.selectedOperation === this.$t('label.add')
this.selectedOperation === 'add'
? !this.permittedProjects.includes(p.id)
: this.permittedProjects.includes(p.id)
) : this.projects
Expand Down Expand Up @@ -252,7 +252,7 @@ export default {
})
},
handleChange (selectedItems) {
if (this.selectedOperation === this.$t('label.add') || this.selectedOperation === this.$t('label.remove')) {
if (this.selectedOperation === 'add' || this.selectedOperation === 'remove') {
if (this.selectedShareWith === this.$t('label.account')) {
this.selectedAccounts = selectedItems
} else {
Expand Down