Merge pull request #379 from hongwei1/develop

refactor/added the Pagination for Consumers page

Author: simonredfern

apimanager/consumers/templates/consumers/includes/filter_pagination.html

@@ -0,0 +1,12 @@
+{% load i18n %}
+<form class="form-inline" method="get">
+    <div class="form-group">
+        <label for="offset">{% trans "Offset" %}:</label>
+        <input type="number" class="form-control" name="offset" id="offset" placeholder="0" value="{{ offset }}">
+    </div>
+    <div class="form-group">
+        <label for="limit">{% trans "Limit" %}:</label>
+        <input type="number" class="form-control" name="limit" id="limit" placeholder="50" value="{{ limit }}">
+    </div>
+    <input type="submit" class="btn btn-default" value ='{% trans "Refresh" %} ' onclick="javascript: form.action='';"></input>
+</form>

apimanager/consumers/templates/consumers/index.html

@@ -44,6 +44,13 @@ <h1>{% trans "Consumers" %}</h1>
 		</div>
 	</div>
 
+    <div class="row">
+        <div class="col-xs-12">
+            <h4>{% trans "Pagination" %}</h4>
+            {% include "consumers/includes/filter_pagination.html" %}
+        </div>
+    </div>
+
 	<h4>{% trans "Statistics" %}</h4>
 	<ul id="statistics">
 		<li>{% trans "Total number of consumers" %}: {{ statistics.consumers_num }} </li>

apimanager/consumers/views.py

@@ -69,7 +69,9 @@ def get_context_data(self, **kwargs):
         sorted_consumers=[]
         api = API(self.request.session.get('obp'))
         try:
-            urlpath = '/management/consumers'
+            limit = self.request.GET.get('limit', 50)
+            offset = self.request.GET.get('offset', 0)
+            urlpath = '/management/consumers?limit={}&offset={}'.format(limit, offset)
             consumers = api.get(urlpath)
             if 'code' in consumers and consumers['code'] >= 400:
                 messages.error(self.request, consumers['message'])
@@ -86,6 +88,8 @@ def get_context_data(self, **kwargs):
 
                 context.update({
                     'consumers': sorted_consumers,
+                    'limit': limit,
+                    'offset': offset,
                     'statistics': self.compile_statistics(consumers),
                 })
         except APIError as err: