openstack/zaqar-ui
Code Issues Proposed changes

New queues does not display message count

Browse Source 
When a new queue is created, it does not display the message count
correctly. This patch fixes this error and minor changes to table columns.

Change-Id: I097229dbdd1c2aeacf684087dab9cfd1f07ae45e
This commit is contained in:
Thai Tran 2016-03-01 14:06:17 -08:00
parent b212d4aea6
commit a84224324b
5 changed files with 16 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
zaqar_ui/api/rest/zaqar.py
View File

@ -72,5 +72,8 @@ class Queues(generic.View):
new_queue = zaqar.queue_create(request, **request.DATA)
location = '/api/zaqar/queues/%s' % new_queue.name
response = {'name': new_queue.name,
'claimed': 0,
'free': 0,
'total': 0,
'metadata': new_queue._metadata}
return rest_utils.CreatedResponse(location, response)

6
zaqar_ui/static/dashboard/project/queues/actions/create.service.js
View File

@ -62,7 +62,7 @@
// will know when a new queue has been created
function initScope($scope) {
scope = $scope;
var queueWatcher = $scope.$on(events.DETAILS_CHANGED, onQueueChange);
var queueWatcher = $scope.$on(events.DETAILS_CHANGED, onDetailChange);
var metadataWatcher = $scope.$on(events.METADATA_CHANGED, onMetadataChange);
$scope.$on('$destroy', function destroy() {
queueWatcher();
@ -70,8 +70,8 @@
});
}
function onQueueChange(e, queue) {
model.queue_name = queue.name;
function onDetailChange(e, queue) {
angular.extend(model, queue);
e.stopPropagation();
}

2
zaqar_ui/static/dashboard/project/queues/steps/queue-details/queue-details.html
View File

@ -17,7 +17,7 @@
<input required
id="queueDetailsForm-name" name="name"
type="text" class="form-control"
ng-model="detailsCtrl.queue.name"
ng-model="detailsCtrl.queue.queue_name"
ng-maxlength="255"
placeholder="{$ 'Enter a queue name'|translate $}">
<p class="help-block alert alert-danger"

6
zaqar_ui/static/dashboard/project/queues/table/table.controller.js
View File

@ -62,13 +62,13 @@
function init() {
registry.initActions(type, $scope);
zaqar.getQueues().success(getQueuesSuccess);
zaqar.getQueues().then(showQueues);
}
function getQueuesSuccess(response) {
function showQueues(response) {
// hz-table expects all items to have the id field
// so we need to manually add name as id here
ctrl.queuesSrc = response;
ctrl.queuesSrc = response.data;
ctrl.queuesSrc.map(function addIdentifier(queue, index){
queue.id = queue.name;
});

22
zaqar_ui/static/dashboard/project/queues/table/table.html
View File

@ -33,9 +33,9 @@
</th>
<th class="expander"></th>
<th class="rsp-p1" st-sort="name" st-sort-default translate>Name</th>
<th class="rsp-p2" st-sort="metadata" translate>Claimed Messages</th>
<th class="rsp-p1" st-sort="metadata" translate>Claimed Messages</th>
<th class="rsp-p2" st-sort="metadata" translate>Free Messages</th>
<th class="rsp-p2" st-sort="metadata" translate>Total Messages</th>
<th class="rsp-p1" st-sort="metadata" translate>Total Messages</th>
<th class="action-col" translate>Actions</th>
</tr>
</thead>
@ -63,9 +63,9 @@
</td>
<td class="rsp-p1">{$ q.name $}</td>
<td class="rsp-p2">{$ q.claimed $}</td>
<td class="rsp-p1">{$ q.claimed $}</td>
<td class="rsp-p2">{$ q.free $}</td>
<td class="rsp-p2">{$ q.total $}</td>
<td class="rsp-p1">{$ q.total $}</td>
<td class="action-col">
<!--
Table-row-action-column:
@ -96,18 +96,8 @@
-->
<span class="rsp-alt-p2">
<dl class="col-sm-2">
<dt translate>Flavor</dt>
<dd>{$ q.metadata.flavor $}</dd>
</dl>
<dl class="col-sm-2">
<dt translate>Max Message Size</dt>
<dd>{$ q.metadata.max_message_size $}</dd>
</dl>
<dl class="col-sm-2">
<dt translate>Time To Live</dt>
<dd>{$ q.metadata.ttl $}</dd>
<dt translate>Free Messages</dt>
<dd>{$ q.free $}</dd>
</dl>
</span>