diff --git a/sapl/materia/forms.py b/sapl/materia/forms.py index 423c94303..efe445aa5 100644 --- a/sapl/materia/forms.py +++ b/sapl/materia/forms.py @@ -470,8 +470,6 @@ class TramitacaoForm(ModelForm): def __init__(self, *args, **kwargs): super(TramitacaoForm, self).__init__(*args, **kwargs) self.fields['data_tramitacao'].initial = timezone.now().date() - self.fields['user'].initial = kwargs['initial']['user'] - self.fields['ip'].initial = kwargs['initial']['ip'] ust = UnidadeTramitacao.objects.select_related().all() unidade_tramitacao_destino = [('', '---------')] + [(ut.pk, ut) for ut in ust if ut.comissao and ut.comissao.ativa] @@ -562,8 +560,6 @@ class TramitacaoForm(ModelForm): tramitacao_nova.pk = None tramitacao_nova.materia = ma tramitacao_nova.save() - tramitacao.ip = self.fields['ip'].initial - tramitacao.user = self.fields['user'].initial return tramitacao diff --git a/sapl/materia/tests/test_materia_form.py b/sapl/materia/tests/test_materia_form.py index 63be4a4f9..e29d89815 100644 --- a/sapl/materia/tests/test_materia_form.py +++ b/sapl/materia/tests/test_materia_form.py @@ -194,7 +194,7 @@ def test_valida_campos_obrigatorios_relatoria_form(): @pytest.mark.django_db(transaction=False) def test_valida_campos_obrigatorios_tramitacao_form(): - form = forms.TramitacaoForm(data={}, initial={'user':None, 'ip':''}) + form = forms.TramitacaoForm(data={}) assert not form.is_valid() @@ -212,7 +212,7 @@ def test_valida_campos_obrigatorios_tramitacao_form(): @pytest.mark.django_db(transaction=False) def test_valida_campos_obrigatorios_tramitacao_update_form(): - form = forms.TramitacaoUpdateForm(data={}, initial={'user':None, 'ip':''}) + form = forms.TramitacaoUpdateForm(data={}) assert not form.is_valid() diff --git a/sapl/materia/views.py b/sapl/materia/views.py index 96bc31afc..8f9167db1 100644 --- a/sapl/materia/views.py +++ b/sapl/materia/views.py @@ -1222,8 +1222,6 @@ class TramitacaoCrud(MasterDetailCrud): self.object = form.save() username = self.request.user.username - form.instance.user = self.request.user - form.instance.ip = get_client_ip(self.request) if form.instance.status.indicador == 'F': form.instance.materia.em_tramitacao = False @@ -1254,12 +1252,6 @@ class TramitacaoCrud(MasterDetailCrud): layout_key = 'TramitacaoUpdate' - def get_initial(self): - initial = super(UpdateView, self).get_initial() - initial['ip'] = get_client_ip(self.request) - initial['user'] = self.request.user - return initial - def form_valid(self, form): self.object = form.save() username = self.request.user.username diff --git a/sapl/protocoloadm/forms.py b/sapl/protocoloadm/forms.py index ba7475abf..c783effc2 100644 --- a/sapl/protocoloadm/forms.py +++ b/sapl/protocoloadm/forms.py @@ -658,12 +658,7 @@ class TramitacaoAdmForm(ModelForm): '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() @@ -756,7 +751,10 @@ class TramitacaoAdmEditForm(TramitacaoAdmForm): 'data_encaminhamento', 'data_fim_prazo', 'texto', - ] + 'user', + 'ip'] + widgets = {'user': forms.HiddenInput(), + 'ip': forms.HiddenInput()} def clean(self): super(TramitacaoAdmEditForm, self).clean() diff --git a/sapl/protocoloadm/tests/test_protocoloadm.py b/sapl/protocoloadm/tests/test_protocoloadm.py index f3c167288..cfe68fcd1 100644 --- a/sapl/protocoloadm/tests/test_protocoloadm.py +++ b/sapl/protocoloadm/tests/test_protocoloadm.py @@ -162,7 +162,7 @@ def test_create_tramitacao(admin_client): msg = force_text(_('A origem da nova tramitação deve ser igual ao ' 'destino da última adicionada!')) - + # Verifica se a origem da nova tramitacao é igual ao destino da última assert msg in response.context_data[ 'form'].errors['__all__'] diff --git a/sapl/protocoloadm/views.py b/sapl/protocoloadm/views.py index c93ff3ccd..252637e88 100755 --- a/sapl/protocoloadm/views.py +++ b/sapl/protocoloadm/views.py @@ -1116,6 +1116,8 @@ class TramitacaoAdmCrud(MasterDetailCrud): else: initial['unidade_tramitacao_local'] = '' initial['data_tramitacao'] = timezone.now().date() + initial['ip'] = get_client_ip(self.request) + initial['user'] = self.request.user return initial def get_context_data(self, **kwargs): @@ -1183,7 +1185,14 @@ class TramitacaoAdmCrud(MasterDetailCrud): class DetailView(DocumentoAdministrativoMixin, MasterDetailCrud.DetailView): - pass + + template_name = 'protocoloadm/tramitacaoadministrativo_detail.html' + + def get_context_data(self, **kwargs): + context = super().get_context_data(**kwargs) + context['user'] = self.request.user + return context + class DeleteView(MasterDetailCrud.DeleteView): diff --git a/sapl/templates/materia/tramitacao_detail.html b/sapl/templates/materia/tramitacao_detail.html index 0337ae692..b01e62d24 100644 --- a/sapl/templates/materia/tramitacao_detail.html +++ b/sapl/templates/materia/tramitacao_detail.html @@ -4,32 +4,36 @@ {% block actions %} {% endblock %} {% block detail_content %} {{ block.super }} - {% if tramitacao.user and user.is_superuser %} + {% if user.is_superuser %}
-
-
-

Usuário

-
-
-
- {{tramitacao.user}} + {% if tramitacao.user %} +
+
+

Usuário

+
+
+
+ {{tramitacao.user}} +
-
-
-
-

IP

-
-
-
- {{tramitacao.ip}} + {% endif %} + {% if tramitacao.ip %} +
+
+

IP

+
+
+
+ {{tramitacao.ip}} +
-
+ {% endif %}
{% endif %} {% endblock detail_content %} \ No newline at end of file diff --git a/sapl/templates/protocoloadm/tramitacaoadministrativo_detail.html b/sapl/templates/protocoloadm/tramitacaoadministrativo_detail.html index 3131bc4be..20e2289c9 100644 --- a/sapl/templates/protocoloadm/tramitacaoadministrativo_detail.html +++ b/sapl/templates/protocoloadm/tramitacaoadministrativo_detail.html @@ -1,5 +1,6 @@ {% extends "crud/detail.html" %} {% load i18n %} + {% block actions %} {% load common_tags %} @@ -13,3 +14,39 @@ {% endif %}
{% endblock actions %} + +{% block detail_content %} + {{ block.super }} + {% if user.is_superuser %} +
+ {% if tramitacaoadministrativo.user %} +
+
+

Usuário

+
+
+
+ {{tramitacaoadministrativo.user}} +
+
+
+
+
+ {% endif %} + {% if tramitacaoadministrativo.ip %} +
+
+

IP

+
+
+
+ {{tramitacaoadministrativo.ip}} +
+
+
+
+
+ {% endif %} +
+ {% endif %} +{% endblock detail_content %}