summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVladislav Kuzmin <vkuzmin@mirantis.com>2018-07-03 18:30:09 +0400
committerGUO Larry <larry.guo@nokia-sbell.com>2019-07-08 03:35:03 +0000
commitae1f4abd58f43911c6d8ff0490cb21ee658f6c1e (patch)
tree1f3add83cc3f3296c292dc5c4f30dc93331c85d0
parent2a26c6a8033e499d1565d9c9f9d138979e1c7149 (diff)
downloadhorizon-ae1f4abd58f43911c6d8ff0490cb21ee658f6c1e.tar.gz
Fix image description field
Nothing changed when edit image description on Angularized panel. This patch fixes it. Change-Id: I29fb643bfa9b648ad24fcb9888c658a5a52e4bcc Closes-Bug: #1779879 Closes-Bug: #1777834 (cherry picked from commit 08e0f38c843816660e2b2930c7c6ee5c0435b4a3)
-rw-r--r--openstack_dashboard/static/app/core/images/actions/edit.action.service.js3
-rw-r--r--openstack_dashboard/static/app/core/images/actions/edit.action.service.spec.js2
-rw-r--r--releasenotes/notes/image-description-3fc00c02f46a80c7.yaml5
3 files changed, 8 insertions, 2 deletions
diff --git a/openstack_dashboard/static/app/core/images/actions/edit.action.service.js b/openstack_dashboard/static/app/core/images/actions/edit.action.service.js
index 014bf3fd0..822d6fec5 100644
--- a/openstack_dashboard/static/app/core/images/actions/edit.action.service.js
+++ b/openstack_dashboard/static/app/core/images/actions/edit.action.service.js
@@ -103,7 +103,8 @@
.then(onMetadataGet);
function onMetadataGet(response) {
- var updated = metadata;
+ var updated = metadata || Object();
+ updated.description = image.properties.description;
var removed = angular.copy(response.data);
angular.forEach(updated, function(value, key) {
delete removed[key];
diff --git a/openstack_dashboard/static/app/core/images/actions/edit.action.service.spec.js b/openstack_dashboard/static/app/core/images/actions/edit.action.service.spec.js
index 34d20f43e..1d4101d54 100644
--- a/openstack_dashboard/static/app/core/images/actions/edit.action.service.spec.js
+++ b/openstack_dashboard/static/app/core/images/actions/edit.action.service.spec.js
@@ -19,7 +19,7 @@
describe('horizon.app.core.images.actions.edit.service', function() {
var service, $scope, $q, deferred, $timeout, updateImageDeferred;
- var image = {id: 1, name: 'Original'};
+ var image = {id: 1, name: 'Original', properties: {description: 'bla-bla'}};
var existingMetadata = {p1: '1', p2: '2'};
var metadataService = {
diff --git a/releasenotes/notes/image-description-3fc00c02f46a80c7.yaml b/releasenotes/notes/image-description-3fc00c02f46a80c7.yaml
new file mode 100644
index 000000000..a0b5c7322
--- /dev/null
+++ b/releasenotes/notes/image-description-3fc00c02f46a80c7.yaml
@@ -0,0 +1,5 @@
+---
+fixes:
+ - |
+ Fix an error on image description field when it is changed
+ in the Angularized panel [:bug: `1779879`]