Merge "Support subscriptoin age and confirmed"

zaqar_ui/api/zaqar.py

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

zaqar_ui/static/dashboard/project/queues/table/subscription.html

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