From 8ff71dc31f1f7ad0ecd812f8d84b16b274da0bef Mon Sep 17 00:00:00 2001 From: Shu Muto Date: Tue, 5 Sep 2017 13:55:55 +0900 Subject: [PATCH] Fix queue create/update without metadata modification When metadata is not modified in queue create/update, the operation failed. This problem was caused by the patch that changing `$scope` handling[1]. This patch fixes it. [1] https://review.openstack.org/#/c/497127/ Change-Id: Ia7a524c5991c63caa24be7effc1a3bdfb8f914c4 Closes-Bug: #1647995 (cherry picked from commit 89e908c5a2eb968230a799b48fff2c88c1fb1702) --- .../steps/queue-metadata/queue-metadata.controller.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/zaqar_ui/static/dashboard/project/queues/steps/queue-metadata/queue-metadata.controller.js b/zaqar_ui/static/dashboard/project/queues/steps/queue-metadata/queue-metadata.controller.js index 78d45b1..25bdb48 100644 --- a/zaqar_ui/static/dashboard/project/queues/steps/queue-metadata/queue-metadata.controller.js +++ b/zaqar_ui/static/dashboard/project/queues/steps/queue-metadata/queue-metadata.controller.js @@ -87,7 +87,7 @@ return {data: queue.metadata}; } else { var deferred = $q.defer(); - deferred.resolve({data: []}); + deferred.resolve({data: {}}); return deferred.promise; } } @@ -95,10 +95,12 @@ function getExistingMetdataPromise(queue) { if (angular.isDefined(queue.id)) { + $scope.stepModels.queueMetadataForm = queue.metadata; return {data: queue.metadata}; } else { var deferred = $q.defer(); - deferred.resolve({data: []}); + deferred.resolve({data: {}}); + $scope.stepModels.queueMetadataForm = {}; return deferred.promise; } }