diff options
| -rw-r--r-- | meta-ibs/meta-cp2-5422/recipes-phosphor/webui/webui-vue/0002-Temporary-comment-out-CPU-architecture.patch (renamed from meta-ibs/meta-cp2-5422/recipes-phosphor/webui/webui-vue/0003-Temporary-comment-out-CPU-architecture.patch) | 0 | ||||
| -rw-r--r-- | meta-ibs/meta-cp2-5422/recipes-phosphor/webui/webui-vue/0002-add-new-dimm-fields.patch | 29 | ||||
| -rw-r--r-- | meta-ibs/meta-cp2-5422/recipes-phosphor/webui/webui-vue/0003-Temporary-fix-for-dimm-layout.patch | 56 | ||||
| -rw-r--r-- | meta-ibs/meta-cp2-5422/recipes-phosphor/webui/webui-vue_%.bbappend | 4 |
4 files changed, 58 insertions, 31 deletions
diff --git a/meta-ibs/meta-cp2-5422/recipes-phosphor/webui/webui-vue/0003-Temporary-comment-out-CPU-architecture.patch b/meta-ibs/meta-cp2-5422/recipes-phosphor/webui/webui-vue/0002-Temporary-comment-out-CPU-architecture.patch index f7e58dddc0..f7e58dddc0 100644 --- a/meta-ibs/meta-cp2-5422/recipes-phosphor/webui/webui-vue/0003-Temporary-comment-out-CPU-architecture.patch +++ b/meta-ibs/meta-cp2-5422/recipes-phosphor/webui/webui-vue/0002-Temporary-comment-out-CPU-architecture.patch diff --git a/meta-ibs/meta-cp2-5422/recipes-phosphor/webui/webui-vue/0002-add-new-dimm-fields.patch b/meta-ibs/meta-cp2-5422/recipes-phosphor/webui/webui-vue/0002-add-new-dimm-fields.patch deleted file mode 100644 index 0b3cdd6475..0000000000 --- a/meta-ibs/meta-cp2-5422/recipes-phosphor/webui/webui-vue/0002-add-new-dimm-fields.patch +++ /dev/null @@ -1,29 +0,0 @@ -From b2fed2b2735851248931753a70e8135318b51661 Mon Sep 17 00:00:00 2001 -From: eportnov <eportnov@ibs.ru> -Date: Fri, 8 Jul 2022 16:40:06 +0300 -Subject: [PATCH] add new dimm fields - ---- - src/store/modules/HardwareStatus/MemoryStore.js | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/src/store/modules/HardwareStatus/MemoryStore.js b/src/store/modules/HardwareStatus/MemoryStore.js -index fd8f0a9..ff0b00f 100644 ---- a/src/store/modules/HardwareStatus/MemoryStore.js -+++ b/src/store/modules/HardwareStatus/MemoryStore.js -@@ -26,6 +26,7 @@ const MemoryStore = { - SparePartNumber, - Description, - MemoryType, -+ Model, - MemorySize, - LocationIndicatorActive, - Location, -@@ -45,6 +46,7 @@ const MemoryStore = { - sparePartNumber: SparePartNumber, - description: Description, - memoryType: MemoryType, -+ model: Model, - memorySize: MemorySize, - identifyLed: LocationIndicatorActive, - uri: data['@odata.id'], diff --git a/meta-ibs/meta-cp2-5422/recipes-phosphor/webui/webui-vue/0003-Temporary-fix-for-dimm-layout.patch b/meta-ibs/meta-cp2-5422/recipes-phosphor/webui/webui-vue/0003-Temporary-fix-for-dimm-layout.patch new file mode 100644 index 0000000000..66ac04f336 --- /dev/null +++ b/meta-ibs/meta-cp2-5422/recipes-phosphor/webui/webui-vue/0003-Temporary-fix-for-dimm-layout.patch @@ -0,0 +1,56 @@ +From cd02daa95fbf532bba558ca54250b3c3644fb049 Mon Sep 17 00:00:00 2001 +From: Maksim Zakharov <m.zakharov@IBS.RU> +Date: Mon, 29 Aug 2022 12:26:08 +0300 +Subject: [PATCH] fix_for_dimm_layout + +--- + .../Inventory/InventoryTableDimmSlot.vue | 16 ++++++++-------- + 1 file changed, 8 insertions(+), 8 deletions(-) + +diff --git a/src/views/_sila/Overview/Inventory/InventoryTableDimmSlot.vue b/src/views/_sila/Overview/Inventory/InventoryTableDimmSlot.vue +index 249ab728..f94fc4e2 100644 +--- a/src/views/_sila/Overview/Inventory/InventoryTableDimmSlot.vue ++++ b/src/views/_sila/Overview/Inventory/InventoryTableDimmSlot.vue +@@ -81,13 +81,13 @@ + </dl> + <dl> + <!-- Spare Part Number --> +- <dt>{{ $t('pageInventory.table.sparePartNumber') }}:</dt> +- <dd>{{ dataFormatter(item.sparePartNumber) }}</dd> ++ <!-- <dt>{{ $t('pageInventory.table.sparePartNumber') }}:</dt> ++ <dd>{{ dataFormatter(item.sparePartNumber) }}</dd> --> + </dl> + <dl> + <!-- Model --> +- <dt>{{ $t('pageInventory.table.model') }}:</dt> +- <dd>{{ dataFormatter(item.model) }}</dd> ++ <!-- <dt>{{ $t('pageInventory.table.model') }}:</dt> ++ <dd>{{ dataFormatter(item.model) }}</dd> --> + </dl> + </b-col> + <b-col sm="6" xl="6"> +@@ -103,8 +103,8 @@ + </dl> + <dl> + <!-- Enabled--> +- <dt>{{ $t('pageInventory.table.enabled') }}:</dt> +- <dd>{{ dataFormatter(item.enabled) }}</dd> ++ <!-- <dt>{{ $t('pageInventory.table.enabled') }}:</dt> ++ <dd>{{ dataFormatter(item.enabled) }}</dd> --> + </dl> + </b-col> + </b-row> +@@ -118,8 +118,8 @@ + </dl> + <dl> + <!-- Description --> +- <dt>{{ $t('pageInventory.table.description') }}:</dt> +- <dd>{{ dataFormatter(item.description) }}</dd> ++ <!-- <dt>{{ $t('pageInventory.table.description') }}:</dt> ++ <dd>{{ dataFormatter(item.description) }}</dd> --> + </dl> + <dl> + <!-- Memory Type --> +-- +2.35.1 + diff --git a/meta-ibs/meta-cp2-5422/recipes-phosphor/webui/webui-vue_%.bbappend b/meta-ibs/meta-cp2-5422/recipes-phosphor/webui/webui-vue_%.bbappend index 39570bda14..75a990fdc5 100644 --- a/meta-ibs/meta-cp2-5422/recipes-phosphor/webui/webui-vue_%.bbappend +++ b/meta-ibs/meta-cp2-5422/recipes-phosphor/webui/webui-vue_%.bbappend @@ -15,8 +15,8 @@ SRCREV = "10f5207c77b16b46f637f77520964c82226d27fb" SRC_URI += "\ file://favicon.ico \ file://0001-IBS-html-head-title.patch \ - file://0002-add-new-dimm-fields.patch \ - file://0003-Temporary-comment-out-CPU-architecture.patch \ + file://0002-Temporary-comment-out-CPU-architecture.patch \ + file://0003-Temporary-fix-for-dimm-layout.patch \ " do_update_logo () { |