openstack/monasca-ui
Code Issues Proposed changes

Merge "Enhance changing page button of list in monasca-ui"

Browse Source
This commit is contained in:
Jenkins 2016-01-04 16:18:53 +00:00 committed by Gerrit Code Review
commit 6693d9dba2
6 changed files with 104 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
monitoring/alarmdefs/templates/alarmdefs/alarm.html
View File

@ -12,6 +12,9 @@
{{ table.render }}
<div class="pagination">
<span class="step-links">
{% if prev_page_offset != None %}
<a href="?page_offset={{ prev_page_offset }}" class="btn btn-default btn-sm" style="position:relative;top:-35px;">Previous Page</a>
{% endif %}
{% if page_offset %}
<a href="?page_offset={{ page_offset}}" class="btn btn-default btn-sm" style="position:relative;top:-35px;">Next Page</a>
{% endif %}

32
monitoring/alarmdefs/views.py
View File

@ -30,9 +30,12 @@ from monitoring.alarmdefs import constants
from monitoring.alarmdefs import forms as alarm_forms
from monitoring.alarmdefs import tables as alarm_tables
from monitoring import api
from django.core.paginator import Paginator, EmptyPage, PageNotAnInteger
from django.core.paginator import Paginator, EmptyPage
LIMIT = 10
PREV_PAGE_LIMIT = 100
class IndexView(tables.DataTableView):
table_class = alarm_tables.AlarmsTable
template_name = constants.TEMPLATE_PREFIX + 'alarm.html'
@ -56,12 +59,20 @@ class IndexView(tables.DataTableView):
def get_context_data(self, **kwargs):
context = super(IndexView, self).get_context_data(**kwargs)
contacts = []
prev_page_stack = []
page_offset = self.request.GET.get('page_offset')
if page_offset == None:
if self.request.session.has_key('prev_page_stack'):
prev_page_stack = self.request.session['prev_page_stack']
if page_offset is None:
page_offset = 0
prev_page_stack = []
try:
results = api.monitor.alarmdef_list(self.request, page_offset, LIMIT)
# To judge whether there is next page, get LIMIT + 1
results = api.monitor.alarmdef_list(self.request, page_offset,
LIMIT + 1)
num_results = len(results)
paginator = Paginator(results, LIMIT)
contacts = paginator.page(1)
except EmptyPage:
@ -72,11 +83,24 @@ class IndexView(tables.DataTableView):
context["contacts"] = contacts
if len(context["contacts"]) < LIMIT:
if num_results < LIMIT + 1:
context["page_offset"] = None
else:
context["page_offset"] = contacts.object_list[-1]["id"]
if page_offset in prev_page_stack:
index = prev_page_stack.index(page_offset)
prev_page_stack = prev_page_stack[0:index]
prev_page_offset = prev_page_stack[-1] if prev_page_stack else None
if prev_page_offset is not None:
context["prev_page_offset"] = prev_page_offset
if len(prev_page_stack) > PREV_PAGE_LIMIT:
del prev_page_stack[0]
prev_page_stack.append(str(page_offset))
self.request.session['prev_page_stack'] = prev_page_stack
return context

3
monitoring/alarms/templates/alarms/alarm.html
View File

@ -18,6 +18,9 @@
{{ table.render }}
<div class="pagination">
<span class="step-links">
{% if prev_page_offset != None %}
<a href="?page_offset={{ prev_page_offset }}" class="btn btn-default btn-sm" style="position:relative;top:-35px;">Previous Page</a>
{% endif %}
{% if page_offset %}
<a href="?page_offset={{ page_offset}}" class="btn btn-default btn-sm" style="position:relative;top:-35px;">Next Page</a>
{% endif %}

51
monitoring/alarms/views.py
View File

@ -25,7 +25,7 @@ from django.shortcuts import redirect
from django.utils.dateparse import parse_datetime
from django.utils.translation import ugettext as _ # noqa
from django.views.generic import View # noqa
from django.core.paginator import Paginator, EmptyPage, PageNotAnInteger
from django.core.paginator import Paginator, EmptyPage
from horizon import forms
from horizon import tables
@ -39,6 +39,7 @@ LOG = logging.getLogger(__name__)
SERVICES = getattr(settings, 'MONITORING_SERVICES', [])
LIMIT = 10
PREV_PAGE_LIMIT = 100
def get_icon(status):
@ -139,7 +140,7 @@ class AlarmServiceView(tables.DataTableView):
else:
if self.service[:2] == 'id':
try:
name , value = self.service.split("=")
name, value = self.service.split("=")
results = [api.monitor.alarm_show(self.request, value)]
except Exception as e:
messages.error(self.request, _("Could not retrieve alarms"))
@ -150,9 +151,9 @@ class AlarmServiceView(tables.DataTableView):
else:
try:
results = api.monitor.alarm_list_by_dimension(self.request,
self.service,
page_offset,
LIMIT)
self.service,
page_offset,
LIMIT)
except Exception:
messages.error(self.request, _("Could not retrieve alarms"))
results = []
@ -161,15 +162,22 @@ class AlarmServiceView(tables.DataTableView):
def get_context_data(self, **kwargs):
context = super(AlarmServiceView, self).get_context_data(**kwargs)
results = []
prev_page_stack = []
page_offset = self.request.GET.get('page_offset')
if page_offset == None:
if self.request.session.has_key('prev_page_stack'):
prev_page_stack = self.request.session['prev_page_stack']
if page_offset is None:
page_offset = 0
prev_page_stack = []
if self.service == 'all':
try:
# To judge whether there is next page, get LIMIT + 1
results = api.monitor.alarm_list(self.request, page_offset,
LIMIT)
LIMIT + 1)
num_results = len(results)
paginator = Paginator(results, LIMIT)
results = paginator.page(1)
except EmptyPage:
@ -179,17 +187,23 @@ class AlarmServiceView(tables.DataTableView):
else:
if self.service[:2] == 'id':
try:
name , value = self.service.split("=")
name, value = self.service.split("=")
results = [api.monitor.alarm_show(self.request, value)]
except Exception as e:
messages.error(self.request, _("Could not retrieve alarms"))
results = []
else:
try:
# To judge whether there is next page, get LIMIT + 1
results = api.monitor.alarm_list_by_dimension(self.request,
self.service,
page_offset,
LIMIT)
self.service,
page_offset,
LIMIT + 1)
num_results = len(results)
paginator = Paginator(results, LIMIT)
results = paginator.page(1)
except EmptyPage:
results = paginator.page(paginator.num_pages)
except Exception:
messages.error(self.request, _("Could not retrieve alarms"))
results = []
@ -197,11 +211,24 @@ class AlarmServiceView(tables.DataTableView):
context["contacts"] = results
context["service"] = self.service
if len(results) < LIMIT:
if num_results < LIMIT + 1:
context["page_offset"] = None
else:
context["page_offset"] = results[-1]["id"]
if page_offset in prev_page_stack:
index = prev_page_stack.index(page_offset)
prev_page_stack = prev_page_stack[0:index]
prev_page_offset = prev_page_stack[-1] if prev_page_stack else None
if prev_page_offset is not None:
context["prev_page_offset"] = prev_page_offset
if len(prev_page_stack) > PREV_PAGE_LIMIT:
del prev_page_stack[0]
prev_page_stack.append(str(page_offset))
self.request.session['prev_page_stack'] = prev_page_stack
return context

5
monitoring/notifications/templates/notifications/index.html
View File

@ -10,8 +10,11 @@
{{ table.render }}
<div class="pagination">
<span class="step-links">
{% if prev_page_offset != None %}
<a href="?page_offset={{ prev_page_offset }}" class="btn btn-default btn-sm" style="position:relative;top:-35px;">Previous Page</a>
{% endif %}
{% if page_offset %}
<a href="?page_offset={{ page_offset}}" class="btn btn-default btn-sm" style="position:relative;top:-35px;">Next Page</a>
<a href="?page_offset={{ page_offset }}" class="btn btn-default btn-sm" style="position:relative;top:-35px;">Next Page</a>
{% endif %}
</span>
</div>

31
monitoring/notifications/views.py
View File

@ -27,12 +27,14 @@ from horizon import tables
from monitoring.notifications import constants
from monitoring.notifications import forms as notification_forms
from monitoring.notifications import tables as notification_tables
from django.core.paginator import Paginator, EmptyPage, PageNotAnInteger
from django.core.paginator import Paginator, EmptyPage
from monitoring import api
LOG = logging.getLogger(__name__)
LIMIT = 10
PREV_PAGE_LIMIT = 100
class IndexView(tables.DataTableView):
table_class = notification_tables.NotificationsTable
@ -60,12 +62,20 @@ class IndexView(tables.DataTableView):
context = super(IndexView, self).get_context_data(**kwargs)
contacts = []
results = []
prev_page_stack = []
page_offset = self.request.GET.get('page_offset')
if page_offset == None:
if self.request.session.has_key('prev_page_stack'):
prev_page_stack = self.request.session['prev_page_stack']
if page_offset is None:
page_offset = 0
prev_page_stack = []
try:
results = api.monitor.notification_list(self.request, page_offset, LIMIT)
# To judge whether there is next page, get LIMIT + 1
results = api.monitor.notification_list(self.request, page_offset,
LIMIT + 1)
num_results = len(results)
paginator = Paginator(results, LIMIT)
contacts = paginator.page(1)
except EmptyPage:
@ -76,11 +86,24 @@ class IndexView(tables.DataTableView):
context["contacts"] = contacts
if len(contacts.object_list) < LIMIT:
if num_results < LIMIT + 1:
context["page_offset"] = None
else:
context["page_offset"] = contacts.object_list[-1]["id"]
if page_offset in prev_page_stack:
index = prev_page_stack.index(page_offset)
prev_page_stack = prev_page_stack[0:index]
prev_page_offset = prev_page_stack[-1] if prev_page_stack else None
if prev_page_offset is not None:
context["prev_page_offset"] = prev_page_offset
if len(prev_page_stack) > PREV_PAGE_LIMIT:
del prev_page_stack[0]
prev_page_stack.append(str(page_offset))
self.request.session['prev_page_stack'] = prev_page_stack
return context