From 2bb0ed718c71151f17ed26ecbdb5b90ef12799d4 Mon Sep 17 00:00:00 2001
From: Eduardo Calil <dudusaid@gmail.com>
Date: Thu, 28 Jan 2016 12:47:55 -0200
Subject: [PATCH] Fix bug in Relatoria Template and Remove 'None' in
 UnidadeTramitacao

---
 materia/models.py                | 4 ++--
 templates/materia/relatoria.html | 1 -
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/materia/models.py b/materia/models.py
index ccb05d59b..cfd2150e9 100644
--- a/materia/models.py
+++ b/materia/models.py
@@ -3,7 +3,7 @@ from django.utils.translation import ugettext_lazy as _
 
 from comissoes.models import Comissao
 from parlamentares.models import Parlamentar, Partido
-from sapl.utils import YES_NO_CHOICES, make_choices
+from sapl.utils import YES_NO_CHOICES, make_choices, xstr
 
 
 class TipoMateriaLegislativa(models.Model):
@@ -506,7 +506,7 @@ class UnidadeTramitacao(models.Model):
 
     def __str__(self):
         return _('%(orgao)s - %(comissao)s') % {
-            'orgao': self.orgao, 'comissao': self.comissao
+            'orgao': xstr(self.orgao), 'comissao': xstr(self.comissao)
         }
 
 
diff --git a/templates/materia/relatoria.html b/templates/materia/relatoria.html
index 68c2de7db..6e1337218 100644
--- a/templates/materia/relatoria.html
+++ b/templates/materia/relatoria.html
@@ -73,7 +73,6 @@
 					</ul>
 					<input type="submit" name="salvar" value="Salvar" class="primary button"/>
 				</form>
-			{% endif %}
 		</fieldset>
 	</fieldset>
 {% endblock %}
\ No newline at end of file