0002-created-passerelle.base.models.ResourceLogManager.patch

WIP - Anonyme, 13 avril 2018 19:31

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

Subject: [PATCH 2/4] created passerelle.base.models.ResourceLogManager

 passerelle/base/models.py                  | 23 +++++++++++++++++++++-
 passerelle/base/templatetags/passerelle.py | 13 +-----------
 2 files changed, 23 insertions(+), 13 deletions(-)

     from django.utils import timezone
     from django.utils.translation import ugettext_lazy as _
     from django.core.files.base import ContentFile
     from django.core.paginator import Paginator, EmptyPage, PageNotAnInteger
     from django.contrib.contenttypes.models import ContentType
     from django.contrib.contenttypes import fields
-...
             return '%s (on %s <%s>) (for %s)' % (self.codename, self.resource_type, self.resource_pk, self.apiuser)
     class ResourceLogManager(models.Manager):
         def get_paginated_logs(self, appname, slug, page, 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)
             paginator = Paginator(qs, page_size)
             try:
                 logrecords = paginator.page(page)
             except PageNotAnInteger:
                 logrecords = paginator.page(1)
             except (EmptyPage,):
                 logrecords = paginator.page(paginator.num_pages)
             return logrecords
     class ResourceLog(models.Model):
         timestamp = models.DateTimeField(auto_now_add=True)
         appname = models.CharField(max_length=128, verbose_name='appname', null=True)
-...
         message = models.TextField(max_length=2048, verbose_name='message')
         extra = jsonfield.JSONField(verbose_name='extras', default={})
         objects = ResourceLogManager()
         class Meta:
             permissions = (
                 ('view_resourcelog', 'Can view resource logs'),
-...
         def __unicode__(self):
             return '%s %s %s %s' % (self.timestamp, self.levelno, self.appname, self.slug)
     STATUS_CHOICES = (
         ('unknown', _('Unknown')),
         ('up', _('Up')),

     from django import template
     from django.contrib.contenttypes.models import ContentType
     from django.contrib.auth import get_permission_codename
     from django.core.paginator import Paginator, EmptyPage, PageNotAnInteger
     from passerelle.utils import get_trusted_services
     from ..models import AccessRight, ResourceLog
-...
         connector = resource.get_connector_slug()
         context['connector'] = connector
         context['slug'] = resource.slug
         qs = ResourceLog.objects.filter(appname=connector, slug=resource.slug).order_by('-timestamp')
         paginator = Paginator(qs, 10)
         try:
             logrecords = paginator.page(page)
         except PageNotAnInteger:
             logrecords = paginator.page(1)
         except (EmptyPage,):
             logrecords = paginator.page(paginator.num_pages)
         context['logrecords'] = logrecords
         context['logrecords'] = ResourceLog.objects.get_paginated_logs(connector, resource.slug, page)
         return context
+    -

Projet

Général

Profil

Produits Entr'ouvert » Passerelle

0002-created-passerelle.base.models.ResourceLogManager.patch