Fix for Queens rc-1

This patch fixes layout for sined URL dialog and handling message list
response for dialog.
Also, add release notes for Queens.

Change-Id: I30d6d61ab292016bd2fc142379565fa7f97ac09c
This commit is contained in:
Shu Muto 2018-01-30 16:17:03 +09:00
parent 9523d7b173
commit 800e8ecea3
4 changed files with 52 additions and 38 deletions

View File

@ -0,0 +1,8 @@
---
fixes:
- >
[`bug/1647995 <https://bugs.launchpad.net/zaqar-ui/+bug/1647995>`_]
Fixed queue create/update without metadata modification.
When metadata is not modified in queue create/update,
the operation had been failed.

View File

@ -46,7 +46,7 @@
*/ */
zaqar.getMessages(ctrl.queue).then(function (response) { zaqar.getMessages(ctrl.queue).then(function (response) {
ctrl.messages = response; ctrl.messages = response.data;
}); });
////////// //////////

View File

@ -29,7 +29,7 @@
}; };
zaqar = $injector.get('horizon.app.core.openstack-service-api.zaqar'); zaqar = $injector.get('horizon.app.core.openstack-service-api.zaqar');
deferred = $q.defer(); deferred = $q.defer();
deferred.resolve([{id: '1'}]); deferred.resolve({data: [{id: '1'}]});
spyOn(zaqar, 'getMessages').and.returnValue(deferred.promise); spyOn(zaqar, 'getMessages').and.returnValue(deferred.promise);
ctrl = $controller( ctrl = $controller(

View File

@ -65,42 +65,48 @@
// form // form
var form = [ var form = [
{ {
type: "section", type: 'section',
htmlClass: "col-sm-12", htmlClass: 'row',
items: [ items: [
{ // for result message
type: "help",
helpvalue: "",
condition: true
},
{ {
key: "paths", type: "section",
type: "checkboxes", htmlClass: "col-sm-12",
title: gettext("Paths"), items: [
titleMap: [ { // for result message
{value: "messages", name: gettext("Messages")}, type: "help",
{value: "subscriptions", name: gettext("Subscriptions")}, helpvalue: "",
{value: "claims", name: gettext("Claims")} condition: true
], },
htmlClass: "horizontal-checkboxes" {
}, key: "paths",
{ type: "checkboxes",
key: "ttl_seconds", title: gettext("Paths"),
title: gettext("TTL Seconds") titleMap: [
}, {value: "messages", name: gettext("Messages")},
{ {value: "subscriptions", name: gettext("Subscriptions")},
key: "methods", {value: "claims", name: gettext("Claims")}
title: gettext("Methods"), ],
type: "checkboxes", htmlClass: "horizontal-checkboxes"
titleMap: [ },
{value: "GET", name: gettext("GET")}, {
{value: "HEAD", name: gettext("HEAD")}, key: "ttl_seconds",
{value: "OPTIONS", name: gettext("OPTIONS")}, title: gettext("TTL Seconds")
{value: "POST", name: gettext("POST")}, },
{value: "PUT", name: gettext("PUT")}, {
{value: "DELETE", name: gettext("DELETE")} key: "methods",
], title: gettext("Methods"),
htmlClass: "horizontal-checkboxes" type: "checkboxes",
titleMap: [
{value: "GET", name: gettext("GET")},
{value: "HEAD", name: gettext("HEAD")},
{value: "OPTIONS", name: gettext("OPTIONS")},
{value: "POST", name: gettext("POST")},
{value: "PUT", name: gettext("PUT")},
{value: "DELETE", name: gettext("DELETE")}
],
htmlClass: "horizontal-checkboxes"
}
]
} }
] ]
} }
@ -172,11 +178,11 @@
config.form = angular.copy(form); config.form = angular.copy(form);
// for result message // for result message
config.form[0].items[0].helpvalue = "<div class='alert alert-success'>" + config.form[0].items[0].items[0].helpvalue = "<div class='alert alert-success'>" +
interpolate(message.success, interpolate(message.success,
[name, response.data.expires, response.data.signature] [name, response.data.expires, response.data.signature]
) + "</div>"; ) + "</div>";
config.form[0].items[0].condition = false; config.form[0].items[0].items[0].condition = false;
// display new dialog // display new dialog
waitSpinner.hideModalSpinner(); waitSpinner.hideModalSpinner();