Browse Source

correcoes no pull request

pull/2433/head
Cesar Carvalho 7 years ago
parent
commit
2701cbaa8e
  1. 3
      sapl/norma/models.py
  2. 4
      sapl/norma/views.py

3
sapl/norma/models.py

@ -2,6 +2,7 @@ from django.contrib.contenttypes.fields import GenericRelation
from django.db import models from django.db import models
from django.template import defaultfilters from django.template import defaultfilters
from django.utils.translation import ugettext_lazy as _ from django.utils.translation import ugettext_lazy as _
from django.utils import timezone
from model_utils import Choices from model_utils import Choices
import datetime import datetime
import reversion import reversion
@ -197,7 +198,7 @@ class NormaEstatisticas(models.Model):
horario_acesso = models.DateTimeField( horario_acesso = models.DateTimeField(
blank=True, null=True) blank=True, null=True)
ano = models.PositiveSmallIntegerField(verbose_name=_('Ano'), ano = models.PositiveSmallIntegerField(verbose_name=_('Ano'),
choices=RANGE_ANOS, default=datetime.date.today().year) choices=RANGE_ANOS, default=lambda:timezone.now().year)
norma = models.ForeignKey(NormaJuridica, norma = models.ForeignKey(NormaJuridica,
on_delete=models.CASCADE) on_delete=models.CASCADE)
def __str__(self): def __str__(self):

4
sapl/norma/views.py

@ -195,8 +195,8 @@ class NormaCrud(Crud):
if estatisticas_acesso_normas == 'S': if estatisticas_acesso_normas == 'S':
NormaEstatisticas.objects.create(usuario=str(self.request.user), NormaEstatisticas.objects.create(usuario=str(self.request.user),
norma_id=kwargs['pk'], norma_id=kwargs['pk'],
ano = datetime.date.today().year, ano=timezone.now().year,
horario_acesso=datetime.datetime.now()) horario_acesso=timezone.now())
return super().get(request, *args, **kwargs) return super().get(request, *args, **kwargs)

Loading…
Cancel
Save