From e162e41f9250ec6f5867d15474e84a2078b2265b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Pedro=20Sconetto?= Date: Fri, 2 Mar 2018 09:17:05 -0300 Subject: [PATCH] Corrige erros nos testes --- sapl/audiencia/models.py | 6 +++--- sapl/audiencia/views.py | 2 +- sapl/rules/map_rules.py | 15 ++++++++++++++- 3 files changed, 18 insertions(+), 5 deletions(-) diff --git a/sapl/audiencia/models.py b/sapl/audiencia/models.py index 2d03c443e..a8c990329 100644 --- a/sapl/audiencia/models.py +++ b/sapl/audiencia/models.py @@ -66,8 +66,8 @@ class AudienciaPublica(models.Model): max_length=5, verbose_name=_('Horário (hh:mm)')) hora_fim = models.CharField( max_length=5, verbose_name=_('Horário (hh:mm)')) - observacao = models.CharField( - max_length=200, blank=True, verbose_name=_('Observação')) + observacao = models.TextField( + max_length=500, blank=True, verbose_name=_('Observação')) audiencia_cancelada = models.BooleanField( default=False, choices=YES_NO_CHOICES, @@ -102,7 +102,7 @@ class AudienciaPublica(models.Model): ordering = ['nome', 'numero', 'tipo'] def __str__(self): - return self.nome + '-' + self.numero + return self.nome def delete(self, using=None, keep_parents=False): if self.upload_pauta: diff --git a/sapl/audiencia/views.py b/sapl/audiencia/views.py index f85800cea..930ca0314 100644 --- a/sapl/audiencia/views.py +++ b/sapl/audiencia/views.py @@ -11,7 +11,7 @@ from .forms import AudienciaForm from .models import (AudienciaPublica, TipoAudienciaPublica) def index(request): - return HttpResponse("Audiência Pública") + return HttpResponse("Audiência Pública") class AudienciaCrud(Crud): model = AudienciaPublica diff --git a/sapl/rules/map_rules.py b/sapl/rules/map_rules.py index 415c7beca..9ab42eb1f 100644 --- a/sapl/rules/map_rules.py +++ b/sapl/rules/map_rules.py @@ -7,6 +7,7 @@ from sapl.norma import models as norma from sapl.painel import models as painel from sapl.parlamentares import models as parlamentares from sapl.protocoloadm import models as protocoloadm +from sapl.audiencia import models as audiencia from sapl.rules import (RP_ADD, RP_CHANGE, RP_DELETE, RP_DETAIL, RP_LIST, SAPL_GROUP_ADMINISTRATIVO, SAPL_GROUP_ANONYMOUS, SAPL_GROUP_AUTOR, SAPL_GROUP_COMISSOES, @@ -60,6 +61,15 @@ rules_group_administrativo = { ] } +rules_group_audiencia = { + 'group': SAPL_GROUP_GERAL, + 'rules': [ + (audiencia.AudienciaPublica, __base__), + (audiencia.TipoAudienciaPublica, __base__), + ] +} + + rules_group_protocolo = { 'group': SAPL_GROUP_PROTOCOLO, 'rules': [ @@ -273,7 +283,8 @@ rules_group_geral = { (compilacao.TipoDispositivoRelationship, []), (compilacao.PerfilEstruturalTextoArticulado, []), - + (audiencia.AudienciaPublica, __base__), + (audiencia.TipoAudienciaPublica, __base__), @@ -300,6 +311,7 @@ rules_group_geral['rules'] = (rules_group_geral['rules'] + rules_group_administrativo['rules'] + rules_group_protocolo['rules'] + rules_group_comissoes['rules'] + + rules_group_audiencia['rules'] + rules_group_materia['rules'] + rules_group_norma['rules'] + rules_group_sessao['rules'] + @@ -308,6 +320,7 @@ rules_group_geral['rules'] = (rules_group_geral['rules'] + rules_patterns = [ + rules_group_audiencia, rules_group_administrativo, rules_group_protocolo, rules_group_comissoes,