Browse Source

Adiciona registro de usuário e ip no RegistroLeitura

pull/2953/head
Cesar Carvalho 6 years ago
parent
commit
1978f36dc9
  1. 6
      sapl/sessao/forms.py
  2. 3
      sapl/sessao/views.py

6
sapl/sessao/forms.py

@ -1036,10 +1036,14 @@ class OrdemExpedienteLeituraForm(forms.ModelForm):
fields = ['materia', fields = ['materia',
'ordem', 'ordem',
'expediente', 'expediente',
'observacao'] 'observacao',
'user',
'ip']
widgets = {'materia': forms.HiddenInput(), widgets = {'materia': forms.HiddenInput(),
'ordem': forms.HiddenInput(), 'ordem': forms.HiddenInput(),
'expediente': forms.HiddenInput(), 'expediente': forms.HiddenInput(),
'user': forms.HiddenInput(),
'ip': forms.HiddenInput()
} }
def __init__(self, *args, **kwargs): def __init__(self, *args, **kwargs):

3
sapl/sessao/views.py

@ -4387,7 +4387,6 @@ class AbstractLeituraView(FormView):
def get_initial(self): def get_initial(self):
initial = super().get_initial() initial = super().get_initial()
sessao = SessaoPlenaria.objects.get(id=self.kwargs['pk'])
materia = MateriaLegislativa.objects.get(id=self.kwargs['mid']) materia = MateriaLegislativa.objects.get(id=self.kwargs['mid'])
initial['materia'] = materia initial['materia'] = materia
initial['materia__ementa'] = materia.ementa initial['materia__ementa'] = materia.ementa
@ -4400,6 +4399,8 @@ class AbstractLeituraView(FormView):
instance = RegistroLeitura.objects.filter(materia=materia, ordem=ordem) instance = RegistroLeitura.objects.filter(materia=materia, ordem=ordem)
initial['ordem'] = ordem initial['ordem'] = ordem
initial['instance'] = instance initial['instance'] = instance
initial['user'] = self.request.user
initial['ip'] = get_client_ip(self.request)
return initial return initial
def form_valid(self, form): def form_valid(self, form):

Loading…
Cancel
Save