From cf667dd4e5adab2915a2ac628022982e8510ff5c Mon Sep 17 00:00:00 2001 From: Eduardo Edson Batista Cordeiro Alves Date: Wed, 24 Aug 2016 17:25:51 -0300 Subject: [PATCH] =?UTF-8?q?Ajustes=20proposi=C3=A7=C3=A3o?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sapl/materia/views.py | 2 +- sapl/templates/base.html | 2 +- sapl/templates/materia/proposicao_detail.html | 1 - 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/sapl/materia/views.py b/sapl/materia/views.py index c6c00dd8a..f31d53a65 100644 --- a/sapl/materia/views.py +++ b/sapl/materia/views.py @@ -397,7 +397,7 @@ class ProposicaoCrud(Crud): def get_initial(self): try: - autor_id = Autor.objects.get(user=self.request.user.id).id + autor_id = Autor.objects.get(id=self.request.user.id).id except MultipleObjectsReturned: msg = _('Este usuário está relacionado a mais de um autor. ' + 'Operação cancelada') diff --git a/sapl/templates/base.html b/sapl/templates/base.html index cec533fc0..b02ab96e2 100644 --- a/sapl/templates/base.html +++ b/sapl/templates/base.html @@ -62,7 +62,7 @@
  • Receber Proposições
    • {#
  • Protocolo Geral
    • #} - {#
  • Proposições
    • #} + {#
  • Proposições
    • #} diff --git a/sapl/templates/materia/proposicao_detail.html b/sapl/templates/materia/proposicao_detail.html index e2963f548..65f7c370b 100644 --- a/sapl/templates/materia/proposicao_detail.html +++ b/sapl/templates/materia/proposicao_detail.html @@ -4,7 +4,6 @@ {% block actions %}
    -<<<<<<< HEAD {% if proposicao.data_envio %} {% if perms|get_change_perm:view %} {% trans 'Editar Proposição' %}