summaryrefslogtreecommitdiff
path: root/horizon
diff options
context:
space:
mode:
authorTatiana Ovchinnikova <t.v.ovtchinnikova@gmail.com>2023-04-25 15:17:43 -0500
committerTatiana Ovchinnikova <t.v.ovtchinnikova@gmail.com>2023-04-25 15:18:07 -0500
commit283b38e4f10b14c61dff42936c80ae3987f017cf (patch)
treee1e34b42c7adc2f5cfc652465c34cdc3187a4ea0 /horizon
parent87b1455bfe59fa65744dbe9b8c896a2b48c09748 (diff)
downloadhorizon-283b38e4f10b14c61dff42936c80ae3987f017cf.tar.gz
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
Diffstat (limited to 'horizon')
-rw-r--r--horizon/static/framework/widgets/metadata/tree/metadata-tree-item.controller.js6
1 files changed, 6 insertions, 0 deletions
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 c4f8fb5af..4aca18f32 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')
@@ -41,6 +42,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();