0004-add-a-new-page-for-resource-paginated-logs-14671.patch

extra commit for djdt - Anonyme, 13 avril 2018 19:31

Voir les différences: en ligne côte à côte

Subject: [PATCH 4/4] add a new page for resource paginated logs (#14671)

 passerelle/base/models.py                     | 21 +++++-
 passerelle/base/templatetags/passerelle.py    | 12 ---
 .../includes/resource-logs-table.html         | 30 --------
 .../passerelle/manage/service_log.html        | 47 ++++++++++++
 .../passerelle/manage/service_view.html       |  7 +-
 passerelle/urls.py                            |  2 +-
 passerelle/views.py                           | 74 +++++++------------
 7 files changed, 93 insertions(+), 100 deletions(-)
 delete mode 100644 passerelle/templates/passerelle/includes/resource-logs-table.html
 create mode 100644 passerelle/templates/passerelle/manage/service_log.html

             return reverse('delete-connector',
                     kwargs={'connector': self.get_connector_slug(), 'slug': self.slug})
         def get_log_url(self):
             return reverse('view-connector-log',
                     kwargs={'connector': self.get_connector_slug(), 'slug': self.slug})
         def get_description_fields(self):
             fields = []
             for field in self._meta.fields:
-...
     class ResourceLogManager(models.Manager):
         def get_paginated_logs(self, appname, slug, page, order_by=None, page_size=None):
         def get_paginated_logs(self, appname, slug, page, lookup_dict=None, lookup_or=None, order_by=None, page_size=None):
             if order_by is None:
                 order_by = '-timestamp'
             if page_size is None:
                 page_size = 10
             qs = self.filter(appname=appname, slug=slug).order_by(order_by)
             if lookup_dict:
                 q_list = [Q(key=value) for key, value in lookup_dict.items()]
                 lookups = q_list.pop()
                 for q_item in q_list:
                     if lookup_or is None:
                         lookups &= q_item
                     else:
                         lookups |= q_item
                 qs = self.filter(lookups, appname=appname, slug=slug)
             else:
                 qs = self.filter(appname=appname, slug=slug)
             qs.order_by(order_by)
             paginator = Paginator(qs, page_size)
             try:
                 logrecords = paginator.page(page)
-...
         def __unicode__(self):
             return '%s %s %s %s' % (self.timestamp, self.levelno, self.appname, self.slug)
     STATUS_CHOICES = (
         ('unknown', _('Unknown')),
         ('up', _('Up')),

         return context
     @register.inclusion_tag('passerelle/includes/resource-logs-table.html', takes_context=True)
     def resource_logs_table(context, resource):
         request = context.get('request')
         page = request.GET.get('page', 1)
         connector = resource.get_connector_slug()
         context['connector'] = connector
         context['slug'] = resource.slug
         context['logrecords'] = ResourceLog.objects.get_paginated_logs(connector, resource.slug, page)
         return context
     @register.filter
     def can_edit(obj, user):
         return user.has_perm(get_permission_codename('change', obj._meta), obj=obj)

     {% load i18n passerelle %}
     {% load tz %}
     {% block content %}
     {% if logrecords %}
     <table class="main">
         <thead>
             <th>{% trans 'Timestamp' %}</th>
             <th>{% trans 'Source IP' %}</th>
             <th>{% trans 'Message' %}</th>
         </thead>
         <tbody>
         {% for record in logrecords %}
         <tr class="level-{{record.level}}">
             <td class="timestamp">{{ record.timestamp|localtime }}</td>
             <td>{{ record.sourceip|default:"-" }}</td>
             <td class="message">{{ record.message}}</td>
         </tr>
         {% endfor %}
         </tbody>
     </table>
     {% with page_obj=logrecords %}
       {% include "gadjo/pagination.html" with anchor="#logs" %}
     {% endwith %}
     {% else %}
     <p>{% trans 'No records found' %}</p>
     {% endif %}
     {% endblock %}

     {% extends "passerelle/manage/service_view.html" %}
     {% load i18n passerelle %}
     {% load tz %}
     {% block breadcrumb %}
     {{ block.super }}
     <a href="{{object.get_absolute_url}}">{{ object.get_verbose_name }}</a>
     {% endblock %}
     {% block content %}
     {% if perms.base.view_resourcelog %}
     <div id="logs" class="section">
       <h3>{% trans "Logs" %}</h3>
       <div>
       {% block logs %}
       {% if logrecords %}
       <table class="main">
           <thead>
               <th>{% trans 'Timestamp' %}</th>
               <th>{% trans 'Source IP' %}</th>
               <th>{% trans 'Message' %}</th>
           </thead>
           <tbody>
           {% for record in logrecords %}
           <tr class="level-{{record.level}}">
               <td class="timestamp">{{ record.timestamp|localtime }}</td>
               <td>{{ record.sourceip|default:"-" }}</td>
               <td class="message">{{ record.message}}</td>
           </tr>
           {% endfor %}
           </tbody>
       </table>
       {% with page_obj=logrecords %}
         {% include "gadjo/pagination.html" with anchor="#logs" %}
       {% endwith %}
       {% else %}
       <p>{% trans 'No records found' %}</p>
       {% endif %}
       {% endblock %}
       </div>
     </div>
     {% endif %}
     {% endblock %}

     {% if perms.base.view_resourcelog %}
     <div id="logs" class="section">
       <h3>{% trans "Logs" %}</h3>
       <div>
       {% block logs %}
         {% resource_logs_table resource=object %}
       {% endblock %}
       </div>
       <h3><a href={{ object.get_log_url }}>{% trans "Logs" %}</a></h3>
     </div>
     {% endif %}

     urlpatterns += [
         url(r'^(?P<connector>[\w,-]+)/(?P<slug>[\w,-]+)/$',
             GenericConnectorView.as_view(), name='view-connector'),
         url(r'^(?P<connector>[\w,-]+)/(?P<slug>[\w,-]+)/logs.json$',
         url(r'^(?P<connector>[\w,-]+)/(?P<slug>[\w,-]+)/logs$',
             GenericConnectorLogView.as_view(), name='view-connector-log'),
         url(r'^(?P<connector>[\w,-]+)/(?P<slug>[\w,-]+)/(?P<endpoint>[\w,-]+)(?:/(?P<rest>.*))?$',
             GenericEndpointView.as_view(), name='generic-endpoint')

     from django.core.exceptions import PermissionDenied
     from django.contrib.auth import logout as auth_logout
     from django.contrib.auth import views as auth_views
     from django.http import HttpResponse, HttpResponseBadRequest, HttpResponseRedirect, Http404
     from django.http import HttpResponse, HttpResponseRedirect, Http404
     from django.views.decorators.csrf import csrf_exempt
     from django.views.generic import (RedirectView, View, TemplateView, CreateView,
             DeleteView, UpdateView, DetailView)
-...
     from django.conf import settings
     from django.shortcuts import resolve_url
     from django.core.urlresolvers import reverse
     from django.core.paginator import EmptyPage, PageNotAnInteger
     from django.utils.translation import ugettext_lazy as _
     from django.utils.encoding import force_text
     from django.utils.timezone import make_aware
     from django.forms.models import modelform_factory
     from django.forms.widgets import ClearableFileInput
     from .base.models import BaseResource, ResourceLog
     from .utils import to_json, is_authorized
     from .forms import GenericConnectorForm
     if 'mellon' in settings.INSTALLED_APPS:
         from mellon.utils import get_idps
     else:
         get_idps = lambda: []
     from passerelle.base.models import BaseResource, ResourceLog
     from .utils import to_json, response_for_json, is_authorized
     from .forms import GenericConnectorForm
     def get_all_apps():
         return [x for x in apps.get_models() if issubclass(x, BaseResource) and \
-...
             template_names.append('passerelle/manage/service_view.html')
             return template_names
     class GenericConnectorLogView(GenericConnectorMixin, View):
         content_type = 'application/json'
         epoch = make_aware(datetime(1970,1,1))
         def totimestamp(self, datetime_obj):
             td = datetime_obj - self.epoch
             # return td.total_seconds()
             return int((td.microseconds + (td.seconds + td.days * 86400) * 10**6) / 10**3)
         def resource_logs_table(self, request, *args, **kwargs):
             if 'slug' not in kwargs:
                 raise HttpResponseBadRequest('URL must specify a slug value')
             if 'connector' not in kwargs:
                 raise HttpResponseBadRequest('URL must specify a connector value')
             page = request.GET.get('page', 1)
             return ResourceLog.objects.get_paginated_logs(kwargs['connector'], kwargs['slug'], page)
         def get(self, request, *args, **kwargs):
             page_obj = self.resource_logs_table(request, *args, **kwargs)
             # no previous or next is representezd a None value
             try:
                 previous_page_number = page_obj.previous_page_number()
             except (EmptyPage,):
                 previous_page_number = None
             try:
                 next_page_number = page_obj.next_page_number()
             except (EmptyPage,):
                 next_page_number = None
             return response_for_json(request, dict([
                 ('count', page_obj.paginator.count),
                 ('page_range', list(page_obj.paginator.page_range)),
                 ('number', page_obj.number),
                 ('next_page_number', next_page_number),
                 ('previous_page_number', previous_page_number),
                 ('logs', [dict([('message', log.message),
                     ('timestamp', self.totimestamp(log.timestamp)),
                     ('level', log.level),
                     ('extra', log.extra),
                     ('sourceip', log.sourceip)]) for log in page_obj])
             ]))
     class GenericConnectorLogView(GenericConnectorMixin, DetailView):
         template_name = 'passerelle/manage/service_log.html'
         def query_resource_log_paginator(self, connector, slug, **kwargs):
             page = kwargs.get('page', 1)
             return ResourceLog.objects.get_paginated_logs(connector, slug, page,
                 lookup_dict=kwargs.get('lookups'), lookup_or=kwargs.get('lookup_or'),
                 order_by=kwargs.get('order_by'), page_size=kwargs.get('page_size'))
         def get_context_data(self, object, **kwargs):
             # request = context.get('request')
             connector = object.get_connector_slug()
             page_obj = self.query_resource_log_paginator(connector, object.slug, **kwargs)
             return {
                 'view': self,
                 'object': object,
                 'connector': connector,
                 'slug': object.slug,
                 'logrecords': page_obj
+            }
     class GenericCreateConnectorView(GenericConnectorMixin, CreateView):
+    -

Projet

Général

Profil

Produits Entr'ouvert » Passerelle

0004-add-a-new-page-for-resource-paginated-logs-14671.patch