openstack/zaqar-ui
Code Issues Proposed changes

Merge "Support subscriptoin age and confirmed"

Browse Source
This commit is contained in:
Jenkins 2017-03-07 20:38:32 +00:00 committed by Gerrit Code Review
commit 282ed90538
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
zaqar_ui/api/zaqar.py
View File

@ -93,6 +93,8 @@ def subscription_list(request, queue_name):
return [{'subscriber': s.subscriber, return [{'subscriber': s.subscriber,
'id': s.id, 'id': s.id,
'ttl': s.ttl, 'ttl': s.ttl,
'age': s.age,
'confirmed': s.confirmed,
'options': s.options} 'options': s.options}
for s in zaqarclient(request).subscriptions(queue_name)] for s in zaqarclient(request).subscriptions(queue_name)]
@ -102,6 +104,8 @@ def subscription_create(request, queue_name, sub_data):
return {'subscriber': subscription.subscriber, return {'subscriber': subscription.subscriber,
'id': subscription.id, 'id': subscription.id,
'ttl': subscription.ttl, 'ttl': subscription.ttl,
'age': subscription.age,
'confirmed': subscription.confirmed,
'options': subscription.options} 'options': subscription.options}

4
zaqar_ui/static/dashboard/project/queues/table/subscription.html
View File

@ -5,6 +5,8 @@
<tr> <tr>
<th translate>Subscriber</th> <th translate>Subscriber</th>
<th translate>Time to Live</th> <th translate>Time to Live</th>
<th translate>Age</th>
<th translate>Confirmed</th>
<th translate>Options</th> <th translate>Options</th>
<th translate>Actions</th> <th translate>Actions</th>
</tr> </tr>
@ -16,6 +18,8 @@
<tr ng-repeat="sub in subCtrl.queuesMap[q.name].subscriptions"> <tr ng-repeat="sub in subCtrl.queuesMap[q.name].subscriptions">
<td>{$ sub.subscriber $}</td> <td>{$ sub.subscriber $}</td>
<td>{$ sub.ttl $}</td> <td>{$ sub.ttl $}</td>
<td>{$ sub.age $}</td>
<td>{$ sub.confirmed $}</td>
<td>{$ sub.options $}</td> <td>{$ sub.options $}</td>
<td> <td>
<button class="btn btn-xs btn-danger" <button class="btn btn-xs btn-danger"