From c10e381f428a3c77ee11a2a5c14dca2c3e439eea Mon Sep 17 00:00:00 2001 From: Tatiana Ovchinnikova Date: Tue, 25 Apr 2023 15:17:43 -0500 Subject: [PATCH] Remove Description from Edit Image Metadata Image description can be edited through Edit Image -> Image Detail, however it also appears as a property in Edit Image -> Metadata when the description is not empty. It's confusing to have it in two sections of one dialog form, and moreover, the Image Detail field always overwrites the Metadata field. This patch removes Description from Edit Metadata. Closes-Bug: #2017698 Change-Id: I041948b4b71f00894f03cc30cfa4592df4a100c3 (cherry picked from commit 283b38e4f10b14c61dff42936c80ae3987f017cf) --- .../widgets/metadata/tree/metadata-tree-item.controller.js | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/horizon/static/framework/widgets/metadata/tree/metadata-tree-item.controller.js b/horizon/static/framework/widgets/metadata/tree/metadata-tree-item.controller.js index 6234699db6..d1d546eb23 100644 --- a/horizon/static/framework/widgets/metadata/tree/metadata-tree-item.controller.js +++ b/horizon/static/framework/widgets/metadata/tree/metadata-tree-item.controller.js @@ -17,6 +17,7 @@ 'use strict'; var READONLY_PROPERTIES = ['os_hash_algo', 'os_hash_value']; + var DUPLICATE_PROPERTIES = ['description']; angular .module('horizon.framework.widgets.metadata.tree') @@ -40,6 +41,11 @@ ctrl.item.leaf.required = false; } + if ('item' in ctrl && 'leaf' in ctrl.item && + DUPLICATE_PROPERTIES.includes(ctrl.item.leaf.name)) { + delete ctrl.item; + } + if ('item' in ctrl && 'leaf' in ctrl.item && ctrl.item.leaf.type === 'array') { ctrl.values = ctrl.item.leaf.items.enum.filter(filter).sort();