From e2387b4893f611396632a3e451be0b06a3ca7e2c Mon Sep 17 00:00:00 2001 From: Cesar Carvalho Date: Wed, 24 Apr 2019 15:30:34 -0300 Subject: [PATCH] adiciona ip e user para docadm --- sapl/protocoloadm/forms.py | 11 ++++++++++- sapl/protocoloadm/models.py | 12 +++++++++++- 2 files changed, 21 insertions(+), 2 deletions(-) diff --git a/sapl/protocoloadm/forms.py b/sapl/protocoloadm/forms.py index 43f410847..ba7475abf 100644 --- a/sapl/protocoloadm/forms.py +++ b/sapl/protocoloadm/forms.py @@ -654,7 +654,16 @@ class TramitacaoAdmForm(ModelForm): 'data_encaminhamento', 'data_fim_prazo', 'texto', - ] + 'user', + 'ip'] + widgets = {'user': forms.HiddenInput(), + 'ip': forms.HiddenInput()} + + def __init__(self, *args, **kwargs): + super(TramitacaoAdmForm, self).__init__(*args, **kwargs) + + self.fields['user'].initial = kwargs['initial']['user'] + self.fields['ip'].initial = kwargs['initial']['ip'] def clean(self): cleaned_data = super(TramitacaoAdmForm, self).clean() diff --git a/sapl/protocoloadm/models.py b/sapl/protocoloadm/models.py index f792a9cdb..28b11f2cc 100644 --- a/sapl/protocoloadm/models.py +++ b/sapl/protocoloadm/models.py @@ -6,7 +6,8 @@ import reversion from sapl.base.models import Autor from sapl.materia.models import TipoMateriaLegislativa, UnidadeTramitacao -from sapl.utils import RANGE_ANOS, YES_NO_CHOICES, texto_upload_path +from sapl.utils import (RANGE_ANOS, YES_NO_CHOICES, texto_upload_path, + get_settings_auth_user_model) @reversion.register() @@ -318,6 +319,15 @@ class TramitacaoAdministrativo(models.Model): blank=True, verbose_name=_('Texto da Ação')) data_fim_prazo = models.DateField( blank=True, null=True, verbose_name=_('Data Fim do Prazo')) + user = models.ForeignKey(get_settings_auth_user_model(), + verbose_name=_('Usuário'), + on_delete=models.PROTECT, + null=True, + blank=True) + ip = models.CharField(verbose_name=_('IP'), + max_length=30, + blank=True, + default='') class Meta: verbose_name = _('Tramitação de Documento Administrativo')