Browse Source

Corrige erros nos testes

pull/1743/head
João Pedro Sconetto 8 years ago
parent
commit
e162e41f92
  1. 6
      sapl/audiencia/models.py
  2. 2
      sapl/audiencia/views.py
  3. 15
      sapl/rules/map_rules.py

6
sapl/audiencia/models.py

@ -66,8 +66,8 @@ class AudienciaPublica(models.Model):
max_length=5, verbose_name=_('Horário (hh:mm)')) max_length=5, verbose_name=_('Horário (hh:mm)'))
hora_fim = models.CharField( hora_fim = models.CharField(
max_length=5, verbose_name=_('Horário (hh:mm)')) max_length=5, verbose_name=_('Horário (hh:mm)'))
observacao = models.CharField( observacao = models.TextField(
max_length=200, blank=True, verbose_name=_('Observação')) max_length=500, blank=True, verbose_name=_('Observação'))
audiencia_cancelada = models.BooleanField( audiencia_cancelada = models.BooleanField(
default=False, default=False,
choices=YES_NO_CHOICES, choices=YES_NO_CHOICES,
@ -102,7 +102,7 @@ class AudienciaPublica(models.Model):
ordering = ['nome', 'numero', 'tipo'] ordering = ['nome', 'numero', 'tipo']
def __str__(self): def __str__(self):
return self.nome + '-' + self.numero return self.nome
def delete(self, using=None, keep_parents=False): def delete(self, using=None, keep_parents=False):
if self.upload_pauta: if self.upload_pauta:

2
sapl/audiencia/views.py

@ -11,7 +11,7 @@ from .forms import AudienciaForm
from .models import (AudienciaPublica, TipoAudienciaPublica) from .models import (AudienciaPublica, TipoAudienciaPublica)
def index(request): def index(request):
return HttpResponse("Audiência Pública") return HttpResponse("Audiência Pública")
class AudienciaCrud(Crud): class AudienciaCrud(Crud):
model = AudienciaPublica model = AudienciaPublica

15
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.painel import models as painel
from sapl.parlamentares import models as parlamentares from sapl.parlamentares import models as parlamentares
from sapl.protocoloadm import models as protocoloadm 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, from sapl.rules import (RP_ADD, RP_CHANGE, RP_DELETE, RP_DETAIL, RP_LIST,
SAPL_GROUP_ADMINISTRATIVO, SAPL_GROUP_ANONYMOUS, SAPL_GROUP_ADMINISTRATIVO, SAPL_GROUP_ANONYMOUS,
SAPL_GROUP_AUTOR, SAPL_GROUP_COMISSOES, 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 = { rules_group_protocolo = {
'group': SAPL_GROUP_PROTOCOLO, 'group': SAPL_GROUP_PROTOCOLO,
'rules': [ 'rules': [
@ -273,7 +283,8 @@ rules_group_geral = {
(compilacao.TipoDispositivoRelationship, []), (compilacao.TipoDispositivoRelationship, []),
(compilacao.PerfilEstruturalTextoArticulado, []), (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_administrativo['rules'] +
rules_group_protocolo['rules'] + rules_group_protocolo['rules'] +
rules_group_comissoes['rules'] + rules_group_comissoes['rules'] +
rules_group_audiencia['rules'] +
rules_group_materia['rules'] + rules_group_materia['rules'] +
rules_group_norma['rules'] + rules_group_norma['rules'] +
rules_group_sessao['rules'] + rules_group_sessao['rules'] +
@ -308,6 +320,7 @@ rules_group_geral['rules'] = (rules_group_geral['rules'] +
rules_patterns = [ rules_patterns = [
rules_group_audiencia,
rules_group_administrativo, rules_group_administrativo,
rules_group_protocolo, rules_group_protocolo,
rules_group_comissoes, rules_group_comissoes,

Loading…
Cancel
Save