diff options
author | Vitalii Lysak <v.lysak@dunice.net> | 2022-06-30 12:12:48 +0300 |
---|---|---|
committer | Vitalii Lysak <v.lysak@dunice.net> | 2022-06-30 12:12:48 +0300 |
commit | dda50defaeea3a6f4bd68892d71ec94f3cd62113 (patch) | |
tree | 6d51fb16be592de4c46ba06bc266a1b4ca5067ce | |
parent | 9619d9de108507b3706050a0ea267fee61172478 (diff) | |
parent | f763cd2e39ffce9b10191402243e8704794f08ff (diff) | |
download | webui-vue-dda50defaeea3a6f4bd68892d71ec94f3cd62113.tar.xz |
Merge git.sila.ru:pub/openbmc/webui-vue into sila-dev
-rw-r--r-- | src/locales/ru-RU.json | 3 | ||||
-rw-r--r-- | src/store/modules/HardwareStatus/ChassisStore.js | 2 | ||||
-rw-r--r-- | src/store/modules/SecurityAndAccess/SessionsStore.js | 6 |
3 files changed, 6 insertions, 5 deletions
diff --git a/src/locales/ru-RU.json b/src/locales/ru-RU.json index 61a53843..75ff4c1b 100644 --- a/src/locales/ru-RU.json +++ b/src/locales/ru-RU.json @@ -924,6 +924,9 @@ } }, "pageSerialOverLan": { + "alert": { + "disconnectedAlertMessage" : "Система должна быть включена для соединения" + }, "connected": "Подключено", "disconnected": "Отключено", "openNewTab": "Открыть в новом окне", diff --git a/src/store/modules/HardwareStatus/ChassisStore.js b/src/store/modules/HardwareStatus/ChassisStore.js index 8a08e370..97930d2e 100644 --- a/src/store/modules/HardwareStatus/ChassisStore.js +++ b/src/store/modules/HardwareStatus/ChassisStore.js @@ -22,6 +22,7 @@ const ChassisStore = { PowerState, LocationIndicatorActive, AssetTag, + Model, MaxPowerWatts, MinPowerWatts, Name, @@ -39,6 +40,7 @@ const ChassisStore = { statusState: Status.State, healthRollup: Status.HealthRollup, assetTag: AssetTag, + model: Model, maxPowerWatts: MaxPowerWatts, minPowerWatts: MinPowerWatts, name: Name, diff --git a/src/store/modules/SecurityAndAccess/SessionsStore.js b/src/store/modules/SecurityAndAccess/SessionsStore.js index 37ba9fc2..54607ab6 100644 --- a/src/store/modules/SecurityAndAccess/SessionsStore.js +++ b/src/store/modules/SecurityAndAccess/SessionsStore.js @@ -25,14 +25,10 @@ const SessionsStore = { ) .then((sessionUris) => { const allConnectionsData = sessionUris.map((sessionUri) => { - //For filtering IP address to IPv4 - let filteredIPAddress = sessionUri.data?.ClientOriginIPAddress.slice( - 7 - ); return { clientID: sessionUri.data?.Oem?.OpenBMC.ClientID, username: sessionUri.data?.UserName, - ipAddress: filteredIPAddress, + ipAddress: sessionUri.data?.ClientOriginIPAddress, uri: sessionUri.data['@odata.id'], }; }); |