summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVitalii Lysak <v.lysak@dunice.net>2022-08-17 17:02:13 +0300
committerVitalii Lysak <v.lysak@dunice.net>2022-08-17 17:02:13 +0300
commitb7691ca4cf12a658d19748dcc243f584a69666f8 (patch)
treefea94673022b48eb7cb3b2a51c8d5f4d47d4247e
parentc1407327f732565819d73fe6b8fbf50c3871e500 (diff)
parent6a19d0c55f1a6c98327c008c4e5f27885a9ecc83 (diff)
downloadwebui-vue-b7691ca4cf12a658d19748dcc243f584a69666f8.tar.xz
Merge branch 'sila' of git.sila.ru:pub/openbmc/webui-vue into sila
-rw-r--r--src/components/_sila/Global/TableRowAction.vue4
-rw-r--r--src/views/_sila/Logs/EventLogs/EventLogs.vue2
-rw-r--r--src/views/_sila/Operations/FactoryReset/FactoryReset.vue1
-rw-r--r--src/views/_sila/Operations/KeyClear/KeyClear.vue1
-rw-r--r--src/views/_sila/Operations/ServerPowerOperations/BootSettings.vue2
5 files changed, 7 insertions, 3 deletions
diff --git a/src/components/_sila/Global/TableRowAction.vue b/src/components/_sila/Global/TableRowAction.vue
index 549f1b52..c18b4f20 100644
--- a/src/components/_sila/Global/TableRowAction.vue
+++ b/src/components/_sila/Global/TableRowAction.vue
@@ -42,7 +42,9 @@
v-else-if="showButton"
variant="link"
:class="{ 'btn-icon-only': btnIconOnly }"
- :disabled="!enabled"
+ :disabled="
+ !enabled || $store.getters['authentication/role'] === 'ReadOnly'
+ "
:title="btnIconOnly ? title : !title"
@click="$emit('click-table-action', value)"
>
diff --git a/src/views/_sila/Logs/EventLogs/EventLogs.vue b/src/views/_sila/Logs/EventLogs/EventLogs.vue
index 8f52083f..f366f5ad 100644
--- a/src/views/_sila/Logs/EventLogs/EventLogs.vue
+++ b/src/views/_sila/Logs/EventLogs/EventLogs.vue
@@ -33,7 +33,7 @@
<b-button
variant="link"
:disabled="
- allLogs.length === 0 &&
+ allLogs.length === 0 ||
$store.getters['authentication/role'] === 'ReadOnly'
"
@click="deleteAllLogs"
diff --git a/src/views/_sila/Operations/FactoryReset/FactoryReset.vue b/src/views/_sila/Operations/FactoryReset/FactoryReset.vue
index b7ae5b8d..3ff14bb8 100644
--- a/src/views/_sila/Operations/FactoryReset/FactoryReset.vue
+++ b/src/views/_sila/Operations/FactoryReset/FactoryReset.vue
@@ -45,6 +45,7 @@
type="submit"
variant="primary"
data-test-id="factoryReset-button-submit"
+ :disabled="$store.getters['authentication/role'] === 'ReadOnly'"
>
{{ $t('global.action.reset') }}
</b-button>
diff --git a/src/views/_sila/Operations/KeyClear/KeyClear.vue b/src/views/_sila/Operations/KeyClear/KeyClear.vue
index b49118d1..70154aaf 100644
--- a/src/views/_sila/Operations/KeyClear/KeyClear.vue
+++ b/src/views/_sila/Operations/KeyClear/KeyClear.vue
@@ -67,6 +67,7 @@
type="submit"
variant="primary"
data-test-id="keyClear-button-submit"
+ :disabled="$store.getters['authentication/role'] === 'ReadOnly'"
>
{{ $t('pageKeyClear.form.clear') }}
</b-button>
diff --git a/src/views/_sila/Operations/ServerPowerOperations/BootSettings.vue b/src/views/_sila/Operations/ServerPowerOperations/BootSettings.vue
index 99c5aa43..7ef83b5d 100644
--- a/src/views/_sila/Operations/ServerPowerOperations/BootSettings.vue
+++ b/src/views/_sila/Operations/ServerPowerOperations/BootSettings.vue
@@ -143,7 +143,7 @@ export default {
let settings;
let bootSource = this.form.bootOption;
let overrideEnabled = this.form.oneTimeBoot;
- let bootMode = this.bootMode;
+ let bootMode = this.form.bootMode;
let tpmEnabled = null;
if (tpmPolicyChanged) tpmEnabled = this.form.tpmPolicyOn;